Got it working so far