hackin around some issues to get this kinda working

Signed-off-by: Tim Henderson <tim.tadh@gmail.com>