WIP refactor Model Classes