New Control/Explorer

WIP PR for Control/Explorer coverage.