MAJOR redstone/internal refactor