Refactoring and beginning work on AdminManager