Finalized tasks for second iterations

As per tech spec

Signed-off-by: Marcin Wiatr <mail.wichura@gmail.com>