admin work in progress
refactoring admin