Update to Aeolus implementation

Complete reconfiguration of Aeolus with new stops.