cosmetic
Initial implementation seems to work - basic tests pass.