just a little more fleshing out of some scaffolding