Finish demo scaffolding