While leaving the old one in place, prep the ground for new analysis phases for the DAG work. The new DAG functions are added, but not hooked in yet. Fixes to the EPP handling have also been added due to issues in resolving include_lib information