Add rest of previous commit

Thanks sublime
Python 3 needs to shut its whore mouth