Temporary upload 2

Most of the stuff should be in there but will still require some fine
tuning. No working code at the moment. Ignore until otherwise said.