Added initial function and test