Some logic on pulling in client assets
New version