W3-A2 TODOs completed and JUnit tests ran successfully