Change structure, temp push to see if it compiles on linux.