(WIP) more changes for new data structures