Last week of work 2

GitHub going crazy! Had to commit twice!