Default to python 3
Merge changes (not yet working)