Unfinished commit, adding admin support