Added files

Will replace them with FOA specific changes ASAP
Added some files
Added stuff
Added stuff
Fixing up broken dirty changes