Crafting Station Prototype
Fix merge conflicts