Initial commit of newer code.