setup option 2 and 3 substantial work, commit more often