wip/xspd
