Add functionallity to skeleton + add test function