Initial checkin of EL&P work
fixed untracked files