Splitting client from server more obviously#3

oliverturner wants to merge 4 commits intomasterconstructorlabs/delivereat:masterfrom

feature/splitconstructorlabs/delivereat:feature/splitCopy head branch name to clipboard