added rest of data structures