simplified structs, program working again.