checking out is unnecessary and disruptive
more stuff
merge wip
either less options differ on osx or -x isn't what i really want