Initial changes, converting files from 3.2 go 2.7... fun times