This is like a 1/3 re-write...

If it doesn't merge now, we will be in crazy-conflict-land in no time.

//cc @kenmanheimer & @merickson