Cleaned up class hierarchy
Added some business logic for adding a Deal instance. Backup for class rearrangement starts here