Scaffolding fixes, still needs work