Refactored into a more modular structure. Cleaned up some dead code. Warnings for timings are temporarily off
Step towards making the general echo interface run