work proceeds moving and deprecating old functions