More work. Still not done, but uploaded to avoid overwrite.