Enviorment setup
merge with remote