Still need to fix WW constructor