Yay for python 3 and silly changes