reshuffle and consolidate
rename
env no longer
some poking around