3/2 con'd

finished the bits for collector and messaging that the team wanted in
place.