Rearranging to fix bug
Fixed errors to allow grooving between Py and Django. aww