Revisit connection updates when moving functions

As for the connections - definitely needs a revert