A bit of re-ordering now I'm testing from scratch.