A bunch more restructuring + preparing for level/section unloading/loading