Started to add additional behavior around how we are actually running this in Echo mode