Hopefully finished week 2 (in a very hacky manner)