Finished Phase 1 with admin part