Admin functionality basics nearly finished - just finalizing a few merges