Refactor to prepare for simulation; support three sims