admin stuff
Admin complete
Fixing merge conflicts
admin testing