New state based execution, and move away from old execution style