Implemented waiver process in manage.py, better segregated some business logic