Another interim commit. Lots of hard-coded rubbish and other temporary and unfinished stuff