Refactor stuff out of ModelGenie and onto the proxies