Work on controls
Prepping for tests