Added in lots of hand parsing, lambda expression bases