some supervisor adjustments, wip controller code

supervisor structure not yet working
controller still pretty ugly