Parser finished. Some refactoring needed