Removed everything, we need to start again with michael's repo