Pull request for review.

move this to assets