Tweak sticky headers logic
Shuffled things around.  Still a WIP -- will nuke these commits soon