Added some comms stuff; finalized changes over weekend