Completed the assignment.
Have to write Unit tests