Control explorer (new PR)

A new PR for Control/Explorer (the old one got broken so badly I decided to move it to new branch)