Committing all of my last changes, about to basically destroy and rebuild this branch with django.