lots of work removing old crap and adding new crap for #151