Just testing a big refactor from amethyst and will start working on it this week or the next