More File Mgmt Code

Uncommented what I could