made some important changes

Pulling to see Gabe's changes