Finished story 4, refactor, unit testings for story 4