CIVI-23 Finished saving accounting logic