Work on making stuff work again with new system.