Added some functions that I have to remove now :/