starting this now because I wanted to get the sim improvements into main first and clear out the mrs.