Lots of working code, no tests. Yeehaw.
BUGFIX: register new instances