End of morning work on Controller and Simulator