Still working on fixing ds_store issues