Added more structs, 495 left to go!