First version of control
This handles the production set, but we still need to get more things
done