django support & get to working state

This finishes up refactoring that was started before, and verifies that code is in a workign state