Direct pyfile usage working. Now need to build tests around it.
Fixing all the broken tests.