backups wip
Enforce changes already made by Nai relating to django related functions
merge conflict