Got this working earlier this week, but figured I post it. CDI file parsing is going well.