Intermediate commit of the initial working version.