Week 2 - Assignment 1

Implemented TODOs and it worked with JUNIT Test.