Feature/add environment

Why dont we check for the exact file name here?