xwikistorage work in progress