Just getting some current changes checked in.  INCOMPLETE