Added some more scaffolding...