Starting work on getting structs to be wrapped properly