First complete non-working version.
This is a backup type commit.