Fix errors in writing the setup logic

Previously changes in the number of steps required the entire setup to
be unneccerserily recalculated. This fixes this issue and attemps to
simply the logic throughout.