mfisher first commit on b
merged david + matt's first commit 9:11 cst