all the work on setup: could this be the final version/commit?