Extended parser, integrated it into the gui and tested it successfully.