got data structures working