add more scaffolding in to start with