Refactor + new admin user (inprogress)