Adding more scaffolding still no tests - booooo