More work done to group Properties. I believe the next step will be the creation of a propertyManager class.