Modified TODO for the "alongside" branch