Converted everything to use six instead of a local re-implementation of six