Good progress on getting the data structure setup