...
Code borken while fixing cloning
...
Lots of refactoring
...