finally refactoring these controllers out.
oops, this isn't read-only
finished refactor, small template changes to accommodate it