adding stuff
Merging more of zachs work