Re-Commit for setup

Unverified email caused problem with set-up. This will hopefully fix
that