commit for pull for connors work
error with merge
moved around stuff to remove race condition (hopefully)