adjust commands to latest spec, implement takeover

Change-Id: I8a254898615b09db0f8b3b4fd14f50c3f72a4cd1