Reorganization + guns now done
Attempt to reduce GC strain