start work on self-contained admin code
fix #1