Added framework for hybrid method.
Merging errors