Intermediate commit to first working version.