Much better responses; fix
Better scaffolding; fix