swap out with constants
adjust tests
finish controlled props