refactoring os in progress!