Partial re-design of Reactor
Reactor (#7) initial implementation - tests a bit behind :-(