I made a cool thing work, I think.
I"m fixing the thing with the merge conflict. BL's code isthe base atm.
trying to restore sanity