Flesh out the comments about Unit