Added parsing mechanism, everything HAS TO BE REFACTORED