Final commit for the night, starting implementation and unit testing