modified parser so that it *hopefully* works. Cant test because elcipse blows