Merging over dan's stuff that he did locally.

-Steven