Added Dir and untested functions