Adding WM stuff, logic is not included