All classes are now in place
Fix API, tests