Revert "Revert "Wind-js branch""

This reverts commit 4a0a3df6506c2d1bc69e8ba6f3681ff6b8b0abb4.