Snapshot 7/30, third try, some tests are passing!