Version 2.9

This is essentially feature complete for version 3.0