Working well-ish now. We can extend it pretty good in the magic file from here.