Trab 1 and Trab 2 are now working again. I'm refactoring Trab3