Fixed a bunch of bugs keeping me from starting to test the logic