more on TODOs
merging