pretty much finished, just a lot of editting left.
Merge branch 'changeFile'