shuffle some code around, comms still wrong (nw)