added in some scaffolding
added a little more