diff --git a/indent/hblang.vim b/indent/hblang.vim
index e69de29..4f5b7f7 100644
--- a/indent/hblang.vim
+++ b/indent/hblang.vim
@@ -0,0 +1,4 @@
+" ALL OF THE FOLLOWING IS T 
+" Some preliminary settings
+setlocal nolisp		" Make sure lisp indenting doesn't supersede us
+setlocal indentexpr=cindent(v:lnum)
diff --git a/syntax/hblang.vim b/syntax/hblang.vim
index 3c086a7..7d42a15 100644
--- a/syntax/hblang.vim
+++ b/syntax/hblang.vim
@@ -1,12 +1,12 @@
 syntax keyword hblangKeywords
-      \ if
-      \ loop
-      \ fn
-      \ return
-	  \ else
-	  \ break
-	  \ continue
-	  \ struct
+  \ if
+  \ loop
+  \ fn
+  \ return
+  \ else
+  \ break
+  \ continue
+  \ struct
 
 syntax match hblangNumber "\v<\d+>"
 syntax match hblangNumber "\v<0x\x+([Pp]-?)?\x+>"
@@ -18,6 +18,9 @@ syntax keyword hblangBoolean true false
 syntax match hblangDirective /@\<\a\+\>/
 syntax match hblangFunction /[a-zA-Z_]\+\ze(/
 
+syntax keyword hblangType int bool void
+syntax match hblangType /u\d\+/
+syntax match hblangType /i\d\+/ 
 
 syntax region hblangString start=/"/ skip=/\\"/ end=/"/ oneline
 syntax region hblangComment start=/\/\// end=/\n/ oneline