Added some todos, ideas

To discuss