done away with structs within structs