Added TODOs to wiki page