Got it working, now needs some polish.