1st commit of stuff from jeff.