Updates code with locations that need to change to have a generic wit…#818

elijahbenizzy wants to merge 2 commits intomainapache/hamilton:mainfrom

generic-with-columnsapache/hamilton:generic-with-columnsCopy head branch name to clipboard