First stab at 0.8 branch