Started changing structs based on new struct structures.