Fixed up extend dep
And now using the new extend
Updated for only requring certain things client side