thought some things through....

...and got really confused, go me…. ended up just adding/changing some
of the headers