fixing up types.
building but there's an exec error.
move wrapper definitions around.