more data structures, compiles again