Refactored out AV code away from models
Refactored admin code