diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..15c74cd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.DS_Store
+test.*
\ No newline at end of file
diff --git a/ng2-html.sublime-completions b/ng2-html.sublime-completions
deleted file mode 100644
index 283c580..0000000
--- a/ng2-html.sublime-completions
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"scope": "text.html meta.tag",
-	"completions": [
-		{ "trigger": "*ngFor", "contents": "*ngFor=\"let ${1:item} of ${2:list}\" "}
-		{ "trigger": "*ngIf", "contents": "*ngIf=\"${1:condition}\" "}
-		{ "trigger": "ngModel", "contents": " [ngModel]=\"${1:model}\" "}
-		{ "trigger": "routerLink", "contents": " [routerLink]=\"['${1:RouteName}']\" "}
-	]
-}
\ No newline at end of file
diff --git a/ng2-ts.sublime-completions b/ng2-ts.sublime-completions
deleted file mode 100644
index ab4ec03..0000000
--- a/ng2-ts.sublime-completions
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"scope": "source.ts source.tsx",
-	"completions": [
-	]
-}
\ No newline at end of file
diff --git a/snippets/ng2-for.sublime-snippet b/snippets/ng2-for.sublime-snippet
new file mode 100644
index 0000000..d9dd52c
--- /dev/null
+++ b/snippets/ng2-for.sublime-snippet
@@ -0,0 +1,7 @@
+<snippet>
+	<content><![CDATA[
+*ngFor="let ${1:item} of ${2:list}"$0]]></content>
+	<tabTrigger>ngFor</tabTrigger>
+	<scope>text.html meta.tag</scope>
+	<description>Angular 2 ngFor Snippet</description>
+</snippet>
\ No newline at end of file
diff --git a/snippets/ng2-if.sublime-snippet b/snippets/ng2-if.sublime-snippet
new file mode 100644
index 0000000..65b5707
--- /dev/null
+++ b/snippets/ng2-if.sublime-snippet
@@ -0,0 +1,7 @@
+<snippet>
+	<content><![CDATA[
+*ngIf="${1:condition}"$0]]></content>
+	<tabTrigger>ngIf</tabTrigger>
+	<scope>text.html meta.tag</scope>
+	<description>Angular 2 ngIf Snippet</description>
+</snippet>
\ No newline at end of file
diff --git a/snippets/ng2-model.sublime-snippet b/snippets/ng2-model.sublime-snippet
new file mode 100644
index 0000000..c6a773a
--- /dev/null
+++ b/snippets/ng2-model.sublime-snippet
@@ -0,0 +1,7 @@
+<snippet>
+	<content><![CDATA[
+[ngModel]="${1:model}"$0]]></content>
+	<tabTrigger>ngModel</tabTrigger>
+	<scope>text.html meta.tag</scope>
+	<description>Angular 2 ngModel Snippet</description>
+</snippet>
\ No newline at end of file
diff --git a/snippets/ng2-router-link.sublime-snippet b/snippets/ng2-router-link.sublime-snippet
new file mode 100644
index 0000000..aead57e
--- /dev/null
+++ b/snippets/ng2-router-link.sublime-snippet
@@ -0,0 +1,7 @@
+<snippet>
+	<content><![CDATA[
+[routerLink]="['${1:Component}']"]]></content>
+	<tabTrigger>routerLink</tabTrigger>
+	<scope>text.html meta.tag</scope>
+	<description>Angular 2 routerLink Snippet</description>
+</snippet>
\ No newline at end of file
diff --git a/snippets/ng2-switch.sublime-snippet b/snippets/ng2-switch.sublime-snippet
new file mode 100644
index 0000000..9377531
--- /dev/null
+++ b/snippets/ng2-switch.sublime-snippet
@@ -0,0 +1,11 @@
+<snippet>
+	<content><![CDATA[
+<div [ngSwitch]="${1:conditionExpression}">
+	<div *ngSwitchWhen="${2:expression}">${3:output}</div>
+	<div *ngSwitchDefault="${4:expression}">${5:output}</div>
+</div>
+	]]></content>
+	<tabTrigger>ngSwitch</tabTrigger>
+	<scope>text.html</scope>
+	<description>Angular 2 ngSwitch Snippet</description>
+</snippet>
\ No newline at end of file