Restws 346

Please ignore this pull, I've made another on the correct branch