Initial import from 2007 code.