End of Friday commit, scaffolding almost complete.: