More functions

More stuff wrapped