Moved most functionality over to manipulators