Nice! Can Amethyst's code help you in anyway? I. am happy to move stuff to a library if needed.