Getting closer to having this work with Django 1.7