FINAL COMMIT QUI MARCHE PRESQUE!!

w00t!!!