move comments to doc-string and add TODO