Early, work-in-progress commit of first working version.