Just about ready for 0.9