move the control list over to its own class
cleanup