handle structs better#3

paulgmiller wants to merge 2 commits intoopenclosed-dev:mainopenclosed-dev/slogan:mainfrom

paulgmiller:takestructspaulgmiller/slogan:takestructsCopy head branch name to clipboard