intermittent commit to comm and contact.

Mostly unfinished stuff having to do with testing and factories.