Largeish overhaul to prepare for Open Beta package