Updates and moved to dust templating system.