Start decoupling everything into base and stack-based states.