Anne audrey refactor

This is audrey's pull request, but I left the files in. (We might want to test views and helpers because we're that good now.)