First cut in upgrading to 0.10