Working on first release of admin code