6 commits- see individual descriptions