mid point commit, still fixing the test