Moved all WM's to seperate class