Stable working copy of the bare minimum. Merging works.