Flesh out Core rooms 368 and 371 and Sarvari rooms 398 and 399