Lots of combinators added