Continued modifying class structure and variable names. I think this might be the format I’m going to stick with. Going to draw out some models to see how it flows before continuing.