I should note that I'm ok with merging this as is as long as we both understand (and agree on) what's going on here. :)