Moved more scaffolding to setup.R