- Adding Set functionality, also add unit test for it