Updated combinators

almost done implementing/testing basic combinators.