WIP — Start on 1.9 support

WIP, taking a fast crack at adding 1.9 support.

cc @tmm1, please feel free to add shit to this at will