Adding stuff and environment specific things