Today ended up being a testing day and more bugs where found. Bugs have been noted in the Main.java TODO comment.