the list/set stuff isnt actually necessary - the #TODO that used to be there wasnt actually relevant