diff --git a/.gitmodules b/.gitmodules
index 9ffd1e2..fec44fc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -84,3 +84,9 @@
 [submodule "bundle/base16-vim"]
 	path = bundle/base16-vim
 	url = https://github.com/chriskempson/base16-vim/
+[submodule "bundle/ultisnips"]
+	path = bundle/ultisnips
+	url = git@github.com:SirVer/ultisnips.git
+[submodule "bundle/vim-snippets"]
+	path = bundle/vim-snippets
+	url = git@github.com:honza/vim-snippets.git
diff --git a/.vimrc b/.vimrc
index 0f15e3e..66b7bca 100644
--- a/.vimrc
+++ b/.vimrc
@@ -131,6 +131,9 @@ let g:tex_conceal='abdmg'
 let g:table_mode_corner_corner='+'
 let g:table_mode_header_fillchar='='
 
+" UtiliSnips
+let g:UltiSnipsExpandTrigger="<tab>"
+let g:UltiSnipsEditSplit="vertical"
 
 " Lion
 let g:lion_squeeze_spaces = 1
@@ -138,171 +141,171 @@ let g:lion_squeeze_spaces = 1
 
 " Quick tex options {{{2
 " HTML {{{3
-let g:quicktex_html = {
-	\' '		:  "\<ESC>/<+.*+>\<CR>\"_c/+>/e\<CR>",
-	\';b'		:  "<b><+++></b> <++>",
-	\';i'		:  "<em><+++></em> <++>",
-	\';1'		:  "<h1><+++></h1> <++>",
-	\';2'		:  "<h2><+++></h2> <++>",
-	\';3'		:  "<h3><+++></h3> <++>",
-	\';p'		:  "<p><+++></p> <++>",
-	\';a'		:  "<a href=\"<++>\"><+++></a> <++>",
-	\';ul'		:  "<ul>\<CR><li><+++></li>\<CR></ul>\<CR>\<CR><++>",
-	\';ol'		:  "<ol>\<CR><li><+++></li>\<CR></ol>\<CR>\<CR><++>",
-	\';li'		:  "<li><++></li>",
-\}
-" CSS {{{3
-let g:quicktex_css = {
-	\' '		:  "\<ESC>/<+.*+>\<CR>\"_c/+>/e\<CR>",
-	\
-	\'w'		:  "width: <+++>;\<CR><++>",
-	\'h'		:  "height: <+++>;\<CR><++>",
-	\'mw'		:  "max-width: <+++>;\<CR><++>",
-	\'mh'		:  "max-height: <+++>;\<CR><++>",
-	\'t'		:  "top: <+++>;\<CR><++>",
-	\'b'		:  "bottom: <+++>;\<CR><++>",
-	\'l'		:  "left: <+++>;\<CR><++>",
-	\'r'		:  "right: <+++>;\<CR><++>",
-	\'pos'		:  "position: <+++>;\<CR><++>",
-	\
-	\'m'		:  "margin: <+++>;\<CR><++>",
-	\'mt'		:  "margin-top: <+++>;\<CR><++>",
-	\'mb'		:  "margin-bottom: <+++>;\<CR><++>",
-	\'ml'		:  "margin-left: <+++>;\<CR><++>",
-	\'mr'		:  "margin-right: <+++>;\<CR><++>",
-	\
-	\'p'		:  "padding: <+++>;\<CR><++>",
-	\'pt'		:  "padding-top: <+++>;\<CR><++>",
-	\'pb'		:  "padding-bottom: <+++>;\<CR><++>",
-	\'pl'		:  "padding-left: <+++>;\<CR><++>",
-	\'pr'		:  "padding-right: <+++>;\<CR><++>",
-	\
-	\'bor'		:  "border: <+++>;\<CR><++>",
-	\'bort'		:  "border-top: <+++>;\<CR><++>",
-	\'borb'		:  "border-bottom: <+++>;\<CR><++>",
-	\'borl'		:  "border-left: <+++>;\<CR><++>",
-	\'borr'		:  "border-right: <+++>;\<CR><++>",
-	\
-	\';abs'		:  "position: absolute;\<CR><++>",
-	\';rel'		:  "position: relative;\<CR><++>",
-	\';fix'		:  "position: fixed;\<CR><++>",
-	\
-	\';block'	:  "display: block;\<CR><++>",
-	\';inl'		:  "display: inline;\<CR><++>",
-	\';inb'		:  "display: inline-block;\<CR><++>",
-	\';flex'	:  "display: flex;\<CR><++>",
-	\';inf'		:  "display: inline-flex;\<CR><++>",
-	\
-	\'include'	:  "@import \"<+++>\";\<CR><++>",
-	\'@include'	:  "@import \"<+++>\";\<CR><++>",
-	\'require'	:  "@import \"<+++>\";\<CR><++>",
-	\'@require'	:  "@import \"<+++>\";\<CR><++>",
-	\'import'	:  "@import \"<+++>\";\<CR><++>",
-	\
-	\'media'	:  "@media (<+++>){\<CR><++>\<CR>}",
-	\';minw'	:  "@media (min-width: <+++>){\<CR><++>\<CR>}",
-	\';mindw'	:  "@media (min-width: @min-desktop-width){\<CR><+++>\<CR>}",
-\}
-let g:quicktex_less = g:quicktex_css
-
-" JS {{{3
-let g:quicktex_javascript = {
-	\' '		:  "\<ESC>/<+.*+>\<CR>\"_c/+>/e\<CR>",
-	\
-	\';fun'		:  "function <+++>(<++>){\<CR><++>\<CR>}",
-	\
-\}
-" Latex Normal {{{3
-let g:quicktex_tex = {
-	\' ' 		: "\<ESC>/<+.*+>\<CR>\"_c/+>/e\<CR>",
-	\';b'		: "\\textbf{<+++>} <++>",
-	\';e'		: "\\emph{<+++>} <++>",
-	\'prf'		: "\\begin{proof}\<CR><+++>\<CR>\\end{proof}",
-	\';m'		: "$<+++>$ <++>",
-	\';M'		: "\\[ <+++> \\] <++>",
-	\';ma'		: "$a$ ",
-	\';mb'		: "$b$ ",
-	\';mc'		: "$c$ ",
-	\';md'		: "$d$ ",
-	\';me'		: "$e$ ",
-	\';mf'		: "$f$ ",
-	\';mg'		: "$g$ ",
-	\';mh'		: "$h$ ",
-	\';mi'		: "$i$ ",
-	\';mj'		: "$j$ ",
-	\';mk'		: "$k$ ",
-	\';ml'		: "$l$ ",
-	\';mm'		: "$m$ ",
-	\';mn'		: "$n$ ",
-	\';mo'		: "$o$ ",
-	\';mp'		: "$p$ ",
-	\';mq'		: "$q$ ",
-	\';mr'		: "$r$ ",
-	\';ms'		: "$s$ ",
-	\';mt'		: "$t$ ",
-	\';mu'		: "$u$ ",
-	\';mv'		: "$v$ ",
-	\';mw'		: "$w$ ",
-	\';mx'		: "$x$ ",
-	\';my'		: "$y$ ",
-	\';mz'		: "$z$ ",
-	\';mA'		: "$A$ ",
-	\';mB'		: "$B$ ",
-	\';mC'		: "$C$ ",
-	\';mD'		: "$D$ ",
-	\';mE'		: "$E$ ",
-	\';mF'		: "$F$ ",
-	\';mG'		: "$G$ ",
-	\';mH'		: "$H$ ",
-	\';mI'		: "$I$ ",
-	\';mJ'		: "$J$ ",
-	\';mK'		: "$K$ ",
-	\';mL'		: "$L$ ",
-	\';mM'		: "$M$ ",
-	\';mN'		: "$N$ ",
-	\';mO'		: "$O$ ",
-	\';mP'		: "$P$ ",
-	\';mQ'		: "$Q$ ",
-	\';mR'		: "$R$ ",
-	\';mS'		: "$S$ ",
-	\';mT'		: "$T$ ",
-	\';mU'		: "$U$ ",
-	\';mV'		: "$V$ ",
-	\';mW'		: "$W$ ",
-	\';mX'		: "$X$ ",
-	\';mY'		: "$Y$ ",
-	\';mZ'		: "$Z$ ",
-\}
-
-" Latex Maths {{{3
-let g:quicktex_math = {
-	\' '    : "\<ESC>/<+.*+>\<CR>\"_c/+>/e\<CR>",
-	\';b'  : "\\mathbf{<+++>} <++>",
-	\';B'  : "\\mathbb{<+++>} <++>",
-	\'fr'   : '\mathcal{R} ',
-	\'eq'   : '= ',
-	\'set'  : '\{ <+++> \} <++>',
-	\'frac' : '\frac{<+++>}{<++>} <++>',
-	\'in'   : '\in ',
-	\'bn'   : '\mathbb{N} ',
-\}
-
-" Markdown {{{3
-let g:quicktex_markdown = {
-	\' '		: "\<ESC>/<+.*+>\<CR>\"_c/+>/e\<CR>",
-	\';b'		: "**<+++>** <++>",
-	\';i'		:  "*<+++>* <++>",
-	\';a'		:  "[<+++>](<+url+>) <++>",
-\}
-let g:quicktex_pandoc = g:quicktex_markdown
-" PHP {{{3
-let g:quicktex_php = {
-	\' '		: "\<ESC>/<+.*+>\<CR>\"_c/+>/e\<CR>",
-	\';ob'		: "ob_start();\<CR><+++>\<CR>ob_get_clean();",
-	\';vd'		:  "var_dump(<+++>);",
-	\';obvd'		: "ob_start();\<CR>var_dump(<+++>);\<CR>echo htmlspecialchars(ob_get_clean());",
-	\';nl'		: "echo '<br />';",
-\}
+" let g:quicktex_html = {
+" 	\' '		:  "\<ESC>/<+.*+>\<CR>\"_c/+>/e\<CR>",
+" 	\';b'		:  "<b><+++></b> <++>",
+" 	\';i'		:  "<em><+++></em> <++>",
+" 	\';1'		:  "<h1><+++></h1> <++>",
+" 	\';2'		:  "<h2><+++></h2> <++>",
+" 	\';3'		:  "<h3><+++></h3> <++>",
+" 	\';p'		:  "<p><+++></p> <++>",
+" 	\';a'		:  "<a href=\"<++>\"><+++></a> <++>",
+" 	\';ul'		:  "<ul>\<CR><li><+++></li>\<CR></ul>\<CR>\<CR><++>",
+" 	\';ol'		:  "<ol>\<CR><li><+++></li>\<CR></ol>\<CR>\<CR><++>",
+" 	\';li'		:  "<li><++></li>",
+" \}
+" " CSS {{{3
+" let g:quicktex_css = {
+" 	\' '		:  "\<ESC>/<+.*+>\<CR>\"_c/+>/e\<CR>",
+" 	\
+" 	\'w'		:  "width: <+++>;\<CR><++>",
+" 	\'h'		:  "height: <+++>;\<CR><++>",
+" 	\'mw'		:  "max-width: <+++>;\<CR><++>",
+" 	\'mh'		:  "max-height: <+++>;\<CR><++>",
+" 	\'t'		:  "top: <+++>;\<CR><++>",
+" 	\'b'		:  "bottom: <+++>;\<CR><++>",
+" 	\'l'		:  "left: <+++>;\<CR><++>",
+" 	\'r'		:  "right: <+++>;\<CR><++>",
+" 	\'pos'		:  "position: <+++>;\<CR><++>",
+" 	\
+" 	\'m'		:  "margin: <+++>;\<CR><++>",
+" 	\'mt'		:  "margin-top: <+++>;\<CR><++>",
+" 	\'mb'		:  "margin-bottom: <+++>;\<CR><++>",
+" 	\'ml'		:  "margin-left: <+++>;\<CR><++>",
+" 	\'mr'		:  "margin-right: <+++>;\<CR><++>",
+" 	\
+" 	\'p'		:  "padding: <+++>;\<CR><++>",
+" 	\'pt'		:  "padding-top: <+++>;\<CR><++>",
+" 	\'pb'		:  "padding-bottom: <+++>;\<CR><++>",
+" 	\'pl'		:  "padding-left: <+++>;\<CR><++>",
+" 	\'pr'		:  "padding-right: <+++>;\<CR><++>",
+" 	\
+" 	\'bor'		:  "border: <+++>;\<CR><++>",
+" 	\'bort'		:  "border-top: <+++>;\<CR><++>",
+" 	\'borb'		:  "border-bottom: <+++>;\<CR><++>",
+" 	\'borl'		:  "border-left: <+++>;\<CR><++>",
+" 	\'borr'		:  "border-right: <+++>;\<CR><++>",
+" 	\
+" 	\';abs'		:  "position: absolute;\<CR><++>",
+" 	\';rel'		:  "position: relative;\<CR><++>",
+" 	\';fix'		:  "position: fixed;\<CR><++>",
+" 	\
+" 	\';block'	:  "display: block;\<CR><++>",
+" 	\';inl'		:  "display: inline;\<CR><++>",
+" 	\';inb'		:  "display: inline-block;\<CR><++>",
+" 	\';flex'	:  "display: flex;\<CR><++>",
+" 	\';inf'		:  "display: inline-flex;\<CR><++>",
+" 	\
+" 	\'include'	:  "@import \"<+++>\";\<CR><++>",
+" 	\'@include'	:  "@import \"<+++>\";\<CR><++>",
+" 	\'require'	:  "@import \"<+++>\";\<CR><++>",
+" 	\'@require'	:  "@import \"<+++>\";\<CR><++>",
+" 	\'import'	:  "@import \"<+++>\";\<CR><++>",
+" 	\
+" 	\'media'	:  "@media (<+++>){\<CR><++>\<CR>}",
+" 	\';minw'	:  "@media (min-width: <+++>){\<CR><++>\<CR>}",
+" 	\';mindw'	:  "@media (min-width: @min-desktop-width){\<CR><+++>\<CR>}",
+" \}
+" let g:quicktex_less = g:quicktex_css
+" 
+" " JS {{{3
+" let g:quicktex_javascript = {
+" 	\' '		:  "\<ESC>/<+.*+>\<CR>\"_c/+>/e\<CR>",
+" 	\
+" 	\';fun'		:  "function <+++>(<++>){\<CR><++>\<CR>}",
+" 	\
+" \}
+" " Latex Normal {{{3
+" let g:quicktex_tex = {
+" 	\' ' 		: "\<ESC>/<+.*+>\<CR>\"_c/+>/e\<CR>",
+" 	\';b'		: "\\textbf{<+++>} <++>",
+" 	\';e'		: "\\emph{<+++>} <++>",
+" 	\'prf'		: "\\begin{proof}\<CR><+++>\<CR>\\end{proof}",
+" 	\';m'		: "$<+++>$ <++>",
+" 	\';M'		: "\\[ <+++> \\] <++>",
+" 	\';ma'		: "$a$ ",
+" 	\';mb'		: "$b$ ",
+" 	\';mc'		: "$c$ ",
+" 	\';md'		: "$d$ ",
+" 	\';me'		: "$e$ ",
+" 	\';mf'		: "$f$ ",
+" 	\';mg'		: "$g$ ",
+" 	\';mh'		: "$h$ ",
+" 	\';mi'		: "$i$ ",
+" 	\';mj'		: "$j$ ",
+" 	\';mk'		: "$k$ ",
+" 	\';ml'		: "$l$ ",
+" 	\';mm'		: "$m$ ",
+" 	\';mn'		: "$n$ ",
+" 	\';mo'		: "$o$ ",
+" 	\';mp'		: "$p$ ",
+" 	\';mq'		: "$q$ ",
+" 	\';mr'		: "$r$ ",
+" 	\';ms'		: "$s$ ",
+" 	\';mt'		: "$t$ ",
+" 	\';mu'		: "$u$ ",
+" 	\';mv'		: "$v$ ",
+" 	\';mw'		: "$w$ ",
+" 	\';mx'		: "$x$ ",
+" 	\';my'		: "$y$ ",
+" 	\';mz'		: "$z$ ",
+" 	\';mA'		: "$A$ ",
+" 	\';mB'		: "$B$ ",
+" 	\';mC'		: "$C$ ",
+" 	\';mD'		: "$D$ ",
+" 	\';mE'		: "$E$ ",
+" 	\';mF'		: "$F$ ",
+" 	\';mG'		: "$G$ ",
+" 	\';mH'		: "$H$ ",
+" 	\';mI'		: "$I$ ",
+" 	\';mJ'		: "$J$ ",
+" 	\';mK'		: "$K$ ",
+" 	\';mL'		: "$L$ ",
+" 	\';mM'		: "$M$ ",
+" 	\';mN'		: "$N$ ",
+" 	\';mO'		: "$O$ ",
+" 	\';mP'		: "$P$ ",
+" 	\';mQ'		: "$Q$ ",
+" 	\';mR'		: "$R$ ",
+" 	\';mS'		: "$S$ ",
+" 	\';mT'		: "$T$ ",
+" 	\';mU'		: "$U$ ",
+" 	\';mV'		: "$V$ ",
+" 	\';mW'		: "$W$ ",
+" 	\';mX'		: "$X$ ",
+" 	\';mY'		: "$Y$ ",
+" 	\';mZ'		: "$Z$ ",
+" \}
+" 
+" " Latex Maths {{{3
+" let g:quicktex_math = {
+" 	\' '    : "\<ESC>/<+.*+>\<CR>\"_c/+>/e\<CR>",
+" 	\';b'  : "\\mathbf{<+++>} <++>",
+" 	\';B'  : "\\mathbb{<+++>} <++>",
+" 	\'fr'   : '\mathcal{R} ',
+" 	\'eq'   : '= ',
+" 	\'set'  : '\{ <+++> \} <++>',
+" 	\'frac' : '\frac{<+++>}{<++>} <++>',
+" 	\'in'   : '\in ',
+" 	\'bn'   : '\mathbb{N} ',
+" \}
+" 
+" " Markdown {{{3
+" let g:quicktex_markdown = {
+" 	\' '		: "\<ESC>/<+.*+>\<CR>\"_c/+>/e\<CR>",
+" 	\';b'		: "**<+++>** <++>",
+" 	\';i'		:  "*<+++>* <++>",
+" 	\';a'		:  "[<+++>](<+url+>) <++>",
+" \}
+" let g:quicktex_pandoc = g:quicktex_markdown
+" " PHP {{{3
+" let g:quicktex_php = {
+" 	\' '		: "\<ESC>/<+.*+>\<CR>\"_c/+>/e\<CR>",
+" 	\';ob'		: "ob_start();\<CR><+++>\<CR>ob_get_clean();",
+" 	\';vd'		:  "var_dump(<+++>);",
+" 	\';obvd'		: "ob_start();\<CR>var_dump(<+++>);\<CR>echo htmlspecialchars(ob_get_clean());",
+" 	\';nl'		: "echo '<br />';",
+" \}
 
 
 "}}}
diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
new file mode 100644
index 0000000..25b6cb9
--- /dev/null
+++ b/UltiSnips/php.snippets
@@ -0,0 +1,40 @@
+snippet iff "Adds a function in an if"
+if( !function_exists( '${1:function_name}' ) ):
+	/**
+	 * $1
+`!p
+parameters = t[2].split(',')
+lines = []
+for param in parameters:
+	param = param.strip();
+	if( param != '' ):
+		lines.append('	 * @param	' + param + '	@todo');
+
+snip.rv = "\n".join(lines);
+`
+	 * @return @todo
+	**/
+	function $1($2){
+		$6
+	}
+	add_${3:action}( '${4:action_name}', '$1', ${5:10}, `!p
+parameters = t[2]
+if ( parameters == '' ):
+	snip.rv = 0
+else:
+	snip.rv = len( parameters.split(',') );
+
+`);
+endif;
+$0
+endsnippet
+
+snippet obvd "Adds a var dump that is html escaped"
+ob_start();
+	var_dump(${1:${VISUAL}});
+echo htmlspecialchars(ob_get_clean());
+endsnippet
+
+snippet vd "Var dump"
+var_dump(${1:${VISUAL}});
+endsnippet
diff --git a/bundle/ultisnips b/bundle/ultisnips
new file mode 160000
index 0000000..1a99766
--- /dev/null
+++ b/bundle/ultisnips
@@ -0,0 +1 @@
+Subproject commit 1a99766b73783bafb08cfa07d7e29e5387c55189
diff --git a/bundle/vim-snippets b/bundle/vim-snippets
new file mode 160000
index 0000000..5dc42db
--- /dev/null
+++ b/bundle/vim-snippets
@@ -0,0 +1 @@
+Subproject commit 5dc42dbc6c4d9b5068ddde901b79c5e483c42114