Messages 80% done
Merge branch 'william-peer-threading' of https://github.com/lowill/rubt-psw.git into william-peer-threading