Still working with entity classes. I created some errors that now seem to be fixed, and thought it might be a good idea to commit now that the site works.