Got it partly working