diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 00000000..e9899a1d
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,24 @@
+# Commands to start on workspace startup
+tasks:
+  - name: open terminial
+  - name: install & run dev server
+    openMode: split-right
+    init: npm install
+    command: npm start
+
+# Pre-install some extensions
+vscode:
+  extensions:
+    - angular.ng-template
+    - ecmel.vscode-html-css
+    - eamodio.gitlens
+    
+# Ports to expose on workspace startup
+ports:
+  - port: 4200
+    onOpen: open-browser
+
+# Github integration
+github:
+  prebuilds:
+    master: true
\ No newline at end of file
diff --git a/README.md b/README.md
index 9547cffd..01a1339b 100644
--- a/README.md
+++ b/README.md
@@ -14,3 +14,22 @@ docs should give you everything you need to get started:
 * [DeSo Code Walkthrough](https://docs.deso.org/code/walkthrough)
 * [Setting Up Your Dev Environment](https://docs.deso.org/code/dev-setup)
 * [Making Your First Changes](https://docs.deso.org/code/making-your-first-changes)
+
+# Start Coding
+
+The quickest way to contribute changes to DiamondApp is the following these steps:
+
+1. Open frontend repo in Gitpod
+
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/deso-protocol/frontend)
+
+You can use any repo / branch URL and just prepend `https://gitpod.io/#` to it.
+
+2. If needed, login to your github account
+
+3. Set the correct `lastLocalNodeV2`  to `"https://api.tijn.club"` in your browser Local Storage for the gitpod preview URL
+
+4. Create a new branch to start working
+
+To commit / submit a pull reqest from gitpod, you will need to give gitpod additional permissions to your github account: `public_repo, read:org, read:user, repo, user:email, workflow` which you can do on the [GitPod Integrations page](https://gitpod.io/integrations).
+