1st change to include sandstorm user management