Refactor (preparation for multiple models)

Created by  quickdudley  on May 9, 2022
JZRK6Q4KJM2B5NHE257QXMMP4RY6GMNTSSPDPCW63P32SL4NBJWQC
Change contents