Started adding framework for EDH.