Combinator almost working and tested
Added files to be included