Finished refactoring disc.py to use django orm