Pre commit to grab zach's changes before tieing the user to the territories
Merge zachs changes with mine