Completed assignment TODO's

Passed JUnit test