Closer to having structs working correctly.