Some TODOs (properties) and docstrings