Committing what I have because things are organized roughly how I want, and I just accidentally deleted something that wasn't checked in (I don't want that to happen again)
Finished the major refactor