Got it working - final touches