Attempting to refactor collections