Remove initial TODO from source code. Merge stuff still missing.