Starting to refactor into class-based views