Pulling in additions to code sprint pages from @sinker