Moved Echo into its own class