* Added more functions to the wrapper
* Noted lots of changes that need to be made