added some more structure - still in scaffolding stage