Refactored, got ECMA7 server/client working.