first pass, need a page reload ;)
Merge pull request #1 from ryanbeymer/master

Ryan's first pass, need a page reload ;)