tweaks and some initial test JUnit tests. Proper? class diagram. The logic is still broken though