Fixing logic errors and working on getting the classes to all work properly.
Solved merging conflicts
Adjusting output to be correct.