A bunch of changes are in the works. This commit is so I can transfer all the changes to my laptop and work on them over break.