step 1.0 - admin refactor