Work on admin enhancements (Todos, starting to stub out)