made some tests pass; 1 failing and 1 err left