Did a giant re-factoring to split logic into systems