WIP

Had to add some quick fixes to allow for the program to work for the
milestone, but for the most part it is working. Just some minor issues
that can be fixed later.