Massive updates, nearly ready for wider work