Comment out previous Scaffolding until ready