Committing latest work in progress. Wholesale changes.