Data structure and loading overhaul pt. 1