:metal: more communicator tests in
:muscle: painful, externalized delegates and linked more stuff up in the communicator