Added environment support Danny, you probably don't want this