WIP EventMachine purge, major restructure