Adding EventMachine & Namespacing changes