Individual files support
Cleaning up
Merge branch 'individual-file-support' into rehab2