[minor] More configuration parsing and header additions.. Still cleaning up to a nice general structure