I've fixed a bunch of bugs! Please give it a second go, now its much clearer on what you are supposed to do
