Laying the ground work for task closing and edits.

Signed-off-by: mereghost <marcello.rocha@gmail.com>