Added some TODOs for me to documentation, so Ondrej sees what is not final yet