Conta Listo 95%

Signed-off-by: rsequeirav <rsequeirav@gmail.com>