Updating enums and checking in Model.h
Doing some cleanup of old code
Finalized Model.h file