The beginnings of a control panel
Lots of updates to second test
small bug fix