Made it fully independent
Found what to do with the parser
maybe a problem