Adding choices TODO and unit test that could be used for it