Added JUnit for testing, worked on GUI