add return values and enable methods
cleanup, provide enable/disable method on movable