Added echo method
Redid the whole thing