Yep, this was rebased and cleaned up.