wip/xbsql
