finishing up the data structures