Added few todos to remember what to work on next