Test, developers-only, version finished

Code requires a lot of refactoring.