Massive data dump!
Data moved into appropriate folder for massive calculation
Merge branch 'eddie' into daniel