added some generat code and fixed some parser stuff, actually running tests now....