37 tests passing; next few are... difficult