First gitted version.  Incomplete, still has debugging printfs.