7 commits- see breakdown