Parser remade

Now more flexible!