Replaced a structure.

Code now compiles, NOT TESTED