Debug changes to new data structures
Temp
Fix lingering bugs