Got it working a bit