added structs, thoughts