25/34 tests passing - need to fixt first fit