Beginnings of Admin

Forgot to merge and create new branch, doing that now.