Refactoring to allow the upcoming BUD system to hook into most of the redstone system