Near final

Signed-off-by: leonardo-faria <leonardofaria94@gmail.com>