Development pre 4.0

This is the latest pre 4.0 development.