Added some  files. Will add FOA specific changes and replace my existing ones as ASAP. Will add FOA specific changes and replace my existing ones as ASAP