step 0.7 - admin refactor