parsing work - still buggy