Adding new parser
Reworking!
Changed to a new parser for less code and more flexibility