Feature/add environment

Y U Change these lines?