Added first set of func and tests