not quite done 1.2