hopefully done with message.js for a while
Merge branch 'win-test'