first half of big refactor to remove schema versioning, 28 failing tests