Major refactor of control path