I started working on it and made the pull request in amethyst. It's a big change and it will take some time.