Added TODO comments and made som JUnit tests