First great commit for new version of XWork