Lots of changes
mais modificacoes
almost there
AEEE QUASE LA
Merge stage 1