Feature/upgrade with ids

Also re-captures email on upgrade and adds new admin tool to CLI.