Finished the new wrappers for making it easier to work in pure C