rename a bunch of things
working with slop
remove old code