still working on the better scaffolding