not fully done

some tests still fail..