Rewrite to actually support SpagtBridge