partway through controller tests, committing for James