Still making changes to get the first (full) working copy.