Add some functions, and a unittest for what i could test