Commit 44

Bit more cleaning up, reorganising, jiffing around etc.