wip

This is the initial block and will start to refine stuff out...