Got system update, subscribe working.  had to move some org switch code around to avoid cyclic deps