Moved over setup from previous try