Started some minor scaffolding