added TODOs from meeting with pawel