Finish basic echo functionality; add other stuff