Three works! OMG! Wooooo!
Fix up .pyc and __pycache__. James3 works!
Merged with.. upstream?