weeks 4,5 and 6 done, but need refactoring