Initial updates to convert to python 3