adding the rest of the data structures