Cleanups and refactors. Now registers Custom ItemStacks