--- a/samples/freetype.tp	Tue Mar 24 23:13:13 2015 -0700
+++ b/samples/freetype.tp	Wed Mar 25 00:16:37 2015 -0700
@@ -28,8 +28,8 @@
 		glyphs <- #[]
 		//TODO: Use a bytearray once that has an append method
 		pixels <- #[]
-		foreach: (face charmap) :char glyphIndex {
-			face loadGlyph: glyphIndex flags: (render or linearDesign)
+		foreach: (face charmap) :char glyphIdx {
+			face loadGlyph: glyphIdx flags: (render or linearDesign)
 			pixelStart <- pixels length
 			_width <- slot bitmapWidth
 			_height <- slot bitmapRows
@@ -58,6 +58,7 @@
 				leftOffset <- (slot bitmapLeft)
 				topOffset <- (slot bitmapTop)
 				charCode <- char
+				glyphIndex <- glyphIdx
 				
 				atlasX <- -1
 				atlasY <- -1
@@ -264,10 +265,12 @@
 					width <- aWidth
 					height <- aHeight
 					glyphs <- glyphDict
-					drawString:at <- :str :x y {
+					drawString:at:useKerning? <- :str :xPos yPos :kern? {
 						//pixels to font units
-						designPosition <- (x f64) * _pixelFactor
+						designPosition <- (xPos f64) * _pixelFactor
 						charIdx <- 0
+						last <- 0u32
+						useKerning? <- kern? && (face hasKerning?)
 						
 						while: { charIdx < (str byte_length) } do: {
 							//TODO: UTF-8
@@ -275,11 +278,17 @@
 							glyph <- glyphs get: char else: {
 								glyphs get: 0u32 else: { false }
 							}
-							texture copyRect: (glyph atlasRect) To: (glyph destRect: x y)
+							texture copyRect: (glyph atlasRect) To: (glyph destRect: xPos yPos)
 							
 							designPosition <- designPosition + ((glyph hAdvance) f64)
-							x <- (designPosition / _pixelFactor + 0.5) truncInt32
+							if: charIdx > 0 && useKerning? {
+								(face getKerning: last (glyph glyphIndex) mode: ((freetype kerning) unscaled)) value: :kern {
+									designPosition <- designPosition + ((kern x) f64)
+								} none: {}
+							}
+							xPos <- (designPosition / _pixelFactor + 0.5) truncInt32
 							
+							last <- glyph glyphIndex
 							charIdx <- charIdx + 1
 						}
 					}
@@ -360,7 +369,8 @@
 							while: { continue? } do: {
 								renderer clear
 								if: (str length) > 0 {
-									atlas drawString: str at: 0 windowHeight / 2
+									atlas drawString: str at: 0 windowHeight / 3 useKerning?: true
+									atlas drawString: str at: 0 windowHeight * 2 / 3 useKerning?: false
 								} else: {
 									y <- 0
 									x <- 0