Roughly complete coding for Project1-Task VI

Need to refine code and write test cases