OK, removed all the code, let's start again :(