Complete refactor and Ws Change