refactor more to use controllers (#87)