Removed some functions back over to the wrapper.