Starting refactor for Django 1.5