basically all done 17 May