Included some of Tad's code
Merge branch 'master' of https://github.com/zgrove/razzledazzle

My (zgrove) code and Sasmit's both have changes