Merged WS together + engine integration