First commit
Merge https://github.com/TomLefley/Otter-UROP