Got it working on the first simple case.