first 4627 in py27 commit

This is definitely still WIP.