Added structs for per unit info, lots of work