Fleshed out wrapper code a little more.

Need to continue past the parameter code.