Major rework to support the asset pipeline throughout.