Started adding the RI model solver. Still partway.