Moving setup functionality to be a flag