(Collections) WIP / Shifted TODOs around