A few more changes
Jacob's first merge
Trying to fix my files so that I can merge back with the master