temp commit
getting half-way reasonable errors from tests
all tests except the REST ones pass
some tests succeed