Settled on final model design! Yesssss! Also refactored some properties and divided the model into two files.