Push closer to 0.9.6. Just tests and a merge left now...