added some tests, parser needs some work...