added oe-tools header areas to eventually consolitate all messaging
merge conflicts resolved