WIP-Tidied up some stuff to do an initial commit - NOT IN A WORKING STATE