mega refactoring and addedd class from old proyects!!