wow much parsing much objects many creation... plus some renaming