Refactor setup

@bfulton 

Refactored the setup the way we talked about.