-ahem-, @kylemcdonald before you merge....