Just moving around client side tempting.  Perhaps this should be its own task?
Has been moved over to new tasks
Moving over.  Need to finish porting.