Adding -d back in for now. Still needs some work.