Commit scaffolding.  Clean up extra garbage later.