Ok, felt like finishing a bit more.  I took out the OL.Control.Panel and added the controls in separately
* the watcher seems in the wrong place, I'll move this around later
* the buttons are hooked up but I want a sanity check from someone tomorrow