Tweak data structures. May have to redo how neighbors are done. Too tired...