#19: getting further along with the view refactor. Still serious issues, but noticably better.