Starting to work on making views testable. Need to refactor.