XXX: shunting code around