New Master Branch With Working Admin Tools