Merging of assets.

Merging Chris's work into the master branch from zip file.