Revert "Revert "Comitando logica da conta.""

This reverts commit 5c3d432ef207814f36abd84edadce750ad7addcf.