Humungous, ugly and not working commit with django integration