Added some more functions

Leaving work soon.