Initial commit of 2.3a code from Warren Toomey