Support for new assets system, not yet fully done. More work to be done tomorrow.