WIP Commit

Also includes protection for the admin tool.