Even more work on Wrappers

Signed-off-by: Waterpicker <Waterpicker@rocketmail.com>