Added HH model and made Rattay model modular