Finally got the code working, Time to clean lool

Signed-off-by: Exikle <dixondcunha@hotmail.com>