Everything working, reset still buggered, committing so that everything is up to date before simon starts dicking about with this