file system changes - still a little rough, will finalize tomorrow