Added initial code with test