refactored echo class to remove any parsing done there