More config and general scaffolding