Flesh out Classes and clear up comments