Chore controller

merged with current master on my branch. all tests pass. feature tests will be on a separate branch.