almost done

few tests faill