Add state keeper
New control Bar class
Changes to use the control bar class