Fleshed out more of the controls object