diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1711d1c..9c3acea 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,7 +111,6 @@ CPMAddPackage(
         "ALSOFT_STATIC_LIBGCC ON"
 )
 
-# TODO: Clear this paths with *
 file(GLOB SERVER_SOURCES
     "project/lib_projects/raknet/jni/RaknetSources/*.cpp"
     "src/NinecraftApp.cpp"
diff --git a/src/client/gui/screens/crafting/PaneCraftingScreen.cpp b/src/client/gui/screens/crafting/PaneCraftingScreen.cpp
index 4e3d025..4a23720 100755
--- a/src/client/gui/screens/crafting/PaneCraftingScreen.cpp
+++ b/src/client/gui/screens/crafting/PaneCraftingScreen.cpp
@@ -16,6 +16,8 @@
 #include "../../../../world/level/Level.h"
 #include "../../../../world/item/DyePowderItem.h"
 #include "../../../../world/item/crafting/Recipe.h"
+#include "network/RakNetInstance.h"
+#include "network/packet/WantCreatePacket.h"
 #include "platform/input/Keyboard.h"
 
 static NinePatchLayer* guiPaneFrame = NULL;
@@ -439,33 +441,38 @@ void PaneCraftingScreen::craftSelectedItem()
 	ItemInstance resultItem = currentItem->item;
 
 	if (minecraft->player) {
-		// Remove all items required for the recipe and ...
-		for (unsigned int i = 0; i < currentItem->neededItems.size(); ++i) {
-			CItem::ReqItem& req = currentItem->neededItems[i];
+		if (minecraft->isOnline()) {
+			WantCreatePacket packet(minecraft->player->entityId, resultItem.count, resultItem.getAuxValue(), resultItem.id);
+			minecraft->raknetInstance->send(packet);
+		} else {
+			// Remove all items required for the recipe and ...
+			for (unsigned int i = 0; i < currentItem->neededItems.size(); ++i) {
+				CItem::ReqItem& req = currentItem->neededItems[i];
 
-            // If the recipe allows any aux-value as ingredients, first deplete
-            // aux == 0 from inventory. Since I'm not sure if this always is
-            // correct, let's only do it for ingredient sandstone for now.
-            ItemInstance toRemove = req.item;
+				// If the recipe allows any aux-value as ingredients, first deplete
+				// aux == 0 from inventory. Since I'm not sure if this always is
+				// correct, let's only do it for ingredient sandstone for now.
+				ItemInstance toRemove = req.item;
 
-            if (Tile::sandStone->id == req.item.id
-             && Recipe::ANY_AUX_VALUE == req.item.getAuxValue()) {
-                 toRemove.setAuxValue(0);
-                 toRemove.count = minecraft->player->inventory->removeResource(toRemove, true);
-                 toRemove.setAuxValue(Recipe::ANY_AUX_VALUE);
-            }
+				if (Tile::sandStone->id == req.item.id
+				&& Recipe::ANY_AUX_VALUE == req.item.getAuxValue()) {
+					toRemove.setAuxValue(0);
+					toRemove.count = minecraft->player->inventory->removeResource(toRemove, true);
+					toRemove.setAuxValue(Recipe::ANY_AUX_VALUE);
+				}
 
-            if (toRemove.count > 0) {
-                minecraft->player->inventory->removeResource(toRemove);
-            }
+				if (toRemove.count > 0) {
+					minecraft->player->inventory->removeResource(toRemove);
+				}
+			}
+			// ... add the new one! (in this order, to fill empty slots better)
+			// if it doesn't fit, throw it on the ground!
+			if (!minecraft->player->inventory->add(&resultItem)) {
+				minecraft->player->drop(new ItemInstance(resultItem), false);
+			}
+
+			recheckRecipes();
 		}
-		// ... add the new one! (in this order, to fill empty slots better)
-		// if it doesn't fit, throw it on the ground!
-		if (!minecraft->player->inventory->add(&resultItem)) {
-			minecraft->player->drop(new ItemInstance(resultItem), false);
-		}
-
-		recheckRecipes();
 	}
 }
 
diff --git a/src/network/ClientSideNetworkHandler.cpp b/src/network/ClientSideNetworkHandler.cpp
index d754b47..fc3a815 100755
--- a/src/network/ClientSideNetworkHandler.cpp
+++ b/src/network/ClientSideNetworkHandler.cpp
@@ -10,6 +10,7 @@
 #include "../world/entity/player/Inventory.h"
 #include "../client/Minecraft.h"
 #include "../client/gamemode/GameMode.h"
+#include "world/item/ItemInstance.h"
 #ifndef STANDALONE_SERVER
 #include "../client/gui/screens/DisconnectionScreen.h"
 #endif
@@ -385,6 +386,38 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MovePlay
 		entity->lerpTo(packet->x, packet->y, packet->z, packet->yRot, packet->xRot, 3);
 	}
 }
+void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, TakeItemPacket* packet) {
+	if (!level) return;
+
+	LOGI("TakeItemPacket\n");
+
+	ItemInstance* item;
+
+	item->count = packet->count;
+	item->id = packet->itemId;
+	item->setAuxValue(packet->auxValue);
+
+	// if (minecraft->player->entityId == packet->playerId) {
+	if (!minecraft->player->inventory->add(item)) {
+		minecraft->player->drop(new ItemInstance(*item), false);
+	}
+	// }
+}
+
+void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RemoveItemPacket* packet) {
+	// Idk how it works...
+	if (!level) return;
+
+	ItemInstance item;
+
+	item.count = packet->count;
+	item.id = packet->itemId;
+	item.setAuxValue(packet->auxValue);
+
+	// if (minecraft->player->entityId == packet->playerId) {
+	minecraft->player->inventory->removeResource(item);
+	// }
+}
 
 void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MoveEntityPacket* packet)
 {
@@ -782,6 +815,10 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, AnimateP
 	}
 }
 
+void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, WantCreatePacket* packet)
+{
+}
+
 void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, UseItemPacket* packet)
 {
 }
diff --git a/src/network/ClientSideNetworkHandler.h b/src/network/ClientSideNetworkHandler.h
index 1505ec7..b0cb98f 100755
--- a/src/network/ClientSideNetworkHandler.h
+++ b/src/network/ClientSideNetworkHandler.h
@@ -77,6 +77,10 @@ public:
 	virtual void handle(const RakNet::RakNetGUID& source, ChatPacket* packet);
 	virtual void handle(const RakNet::RakNetGUID& source, AdventureSettingsPacket* packet);
 	virtual void handle(const RakNet::RakNetGUID& source, SignUpdatePacket* packet);
+	virtual void handle(const RakNet::RakNetGUID& source, RemoveItemPacket* packet);
+	virtual void handle(const RakNet::RakNetGUID& source, TakeItemPacket* packet);
+	virtual void handle(const RakNet::RakNetGUID& source, WantCreatePacket* packet);
+
 private:
 
 	void requestNextChunk();
diff --git a/src/network/NetEventCallback.h b/src/network/NetEventCallback.h
index 53e5fa4..db3e22b 100755
--- a/src/network/NetEventCallback.h
+++ b/src/network/NetEventCallback.h
@@ -18,6 +18,8 @@ class RemovePlayerPacket;
 class RemoveEntityPacket;
 class MoveEntityPacket;
 //class TeleportEntityPacket;
+class RemoveItemPacket;
+class TakeItemPacket;
 class MovePlayerPacket;
 class PlaceBlockPacket;
 class RemoveBlockPacket;
@@ -48,6 +50,7 @@ class ContainerClosePacket;
 class ContainerSetSlotPacket;
 class ContainerSetDataPacket;
 class ContainerSetContentPacket;
+class WantCreatePacket;
 class ChatPacket;
 class SignUpdatePacket;
 class Minecraft;
@@ -119,6 +122,9 @@ public:
 	virtual void handle(const RakNet::RakNetGUID& source, SignUpdatePacket* packet) {}
 	virtual void handle(const RakNet::RakNetGUID& source, AdventureSettingsPacket* packet) {}
 	virtual void handle(const RakNet::RakNetGUID& source, AnimatePacket* packet) {}
+	virtual void handle(const RakNet::RakNetGUID& source, RemoveItemPacket* packet) {}
+	virtual void handle(const RakNet::RakNetGUID& source, TakeItemPacket* packet) {}
+	virtual void handle(const RakNet::RakNetGUID& source, WantCreatePacket* packet) {}
 
 	//
 	// Common implementation for Client and Server
diff --git a/src/network/Packet.cpp b/src/network/Packet.cpp
index ca1b328..d060356 100755
--- a/src/network/Packet.cpp
+++ b/src/network/Packet.cpp
@@ -2,6 +2,7 @@
 #include "Packet.h"
 #include "../world/level/chunk/LevelChunk.h"
 
+#include "network/packet/TakeItemPacket.h"
 #include "packet/PacketInclude.h"
 
 Packet::Packet()
@@ -41,10 +42,16 @@ Packet* MinecraftPackets::createPacket(int id)
 	case PACKET_ADDITEMENTITY:
 		packet = new AddItemEntityPacket();
 		break;
+	case PACKET_REMOVEITEM:
+		packet = new RemoveItemPacket();
+		break;
+	case PACKET_TAKEITEM:
+		packet = new TakeItemPacket();
+		break;
 	case PACKET_TAKEITEMENTITY:
 		packet = new TakeItemEntityPacket();
 		break;
-	case PACKET_ADDMOB:
+	case PACKET_ADDMOB:	
 		packet = new AddMobPacket();
 		break;
 	case PACKET_ADDPLAYER:
@@ -68,6 +75,9 @@ Packet* MinecraftPackets::createPacket(int id)
 	case PACKET_RESPAWN:
 		packet = new RespawnPacket();
 		break;
+	case PACKET_WANTCREATEITEM:
+		packet = new WantCreatePacket();
+		break;
 	case PACKET_REMOVEENTITY:
 		packet = new RemoveEntityPacket();
 		break;
diff --git a/src/network/Packet.h b/src/network/Packet.h
index e872219..3525bd4 100755
--- a/src/network/Packet.h
+++ b/src/network/Packet.h
@@ -33,7 +33,10 @@ enum MinecraftPacketIds
 	PACKET_REMOVEENTITY,
 	PACKET_ADDITEMENTITY,
 	PACKET_TAKEITEMENTITY,
-
+	PACKET_TAKEITEM,
+	PACKET_REMOVEITEM,
+	PACKET_WANTCREATEITEM,
+	
 	PACKET_MOVEENTITY,
 	PACKET_MOVEENTITY_POS,
 	PACKET_MOVEENTITY_ROT,
diff --git a/src/network/ServerSideNetworkHandler.cpp b/src/network/ServerSideNetworkHandler.cpp
index 883d3a4..bd15ac5 100755
--- a/src/network/ServerSideNetworkHandler.cpp
+++ b/src/network/ServerSideNetworkHandler.cpp
@@ -5,6 +5,9 @@
 #include "../world/entity/player/Inventory.h"
 #include "../world/Container.h"
 #include "../world/inventory/BaseContainerMenu.h"
+#include "network/packet/RemoveItemPacket.h"
+#include "network/packet/TakeItemPacket.h"
+#include "network/packet/WantCreatePacket.h"
 #include "packet/PacketInclude.h"
 
 #include "RakNetInstance.h"
@@ -14,6 +17,10 @@
 #include "../raknet/RakPeerInterface.h"
 #include "../raknet/PacketPriority.h"
 #include "platform/log.h"
+#include "world/item/ItemInstance.h"
+#include "world/item/crafting/Recipe.h"
+#include "world/item/crafting/Recipes.h"
+#include <cstddef>
 #ifndef STANDALONE_SERVER
 #include "../client/sound/SoundEngine.h"
 #endif
@@ -531,6 +538,63 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, AnimateP
 	}
 	redistributePacket(packet, source);
 }
+void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, WantCreatePacket* packet) {
+	LOGI("WantCreatePacket\n");
+	Entity* entity = level->getEntity(packet->playerId);
+
+	if (entity && entity->isPlayer()) {
+		Player* p = (Player*)entity;
+		
+		auto playerInv = p->inventory;
+		
+		ItemInstance wantCreate;
+
+		wantCreate.id = packet->itemId;
+		wantCreate.count = packet->count;
+		wantCreate.setAuxValue(packet->auxValue);
+
+		Recipe* recipe = Recipes::getInstance()->getRecipeFor(wantCreate);
+
+		std::vector<ItemInstance> items = recipe->getItemPack().getItemInstances();
+
+		std::vector<int> checkForExists = {};
+
+		for (int i = Inventory::MAX_SELECTION_SIZE; i < p->inventory->getContainerSize(); ++i) {
+			auto itm = p->inventory->getItem(i);
+
+			if (itm != NULL) {
+				for (int y = 0; y < items.size(); y++) {
+					auto itmRecipe = items.at(y);
+
+					if (itmRecipe.id == itm->id && itmRecipe.count == itm->count) {
+						checkForExists.push_back(itm->id);
+					}
+				}
+			}
+		}
+
+		for (int i = 0; i < items.size(); i++) {
+			auto item = items.at(i);
+
+    		auto it = std::find(checkForExists.begin(), checkForExists.end(), item.id);
+
+			if (it == checkForExists.end()) {
+				return;
+			}
+		}
+
+		for (int i = 0; i < items.size(); i++) {
+			RemoveItemPacket removePacket(packet->playerId, items.at(i).count, items.at(i).getAuxValue(), items.at(i).id);
+			raknetInstance->send(source, removePacket);
+
+			p->inventory->removeItem(new ItemInstance(items.at(i).id, items.at(i).count, items.at(i).getAuxValue()));
+		}
+		TakeItemPacket itemAdd(p->entityId, wantCreate.count, wantCreate.getAuxValue(), wantCreate.id);
+		raknetInstance->send(source, itemAdd);
+
+		p->inventory->add(new ItemInstance(wantCreate.id, wantCreate.count, wantCreate.getAuxValue()));
+	}
+}
 
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, UseItemPacket* packet)
 {
diff --git a/src/network/ServerSideNetworkHandler.h b/src/network/ServerSideNetworkHandler.h
index 51531cf..a65585a 100755
--- a/src/network/ServerSideNetworkHandler.h
+++ b/src/network/ServerSideNetworkHandler.h
@@ -58,7 +58,8 @@ public:
 	virtual void handle(const RakNet::RakNetGUID& source, ContainerClosePacket* packet);
 	virtual void handle(const RakNet::RakNetGUID& source, SignUpdatePacket* packet);
 	virtual void handle(const RakNet::RakNetGUID& source, ChatPacket* packet);
-
+	virtual void handle(const RakNet::RakNetGUID& source, WantCreatePacket* packet);
+	
 	bool allowsIncomingConnections() { return _allowIncoming; }
 	void allowIncomingConnections(bool doAllow);
 
diff --git a/src/network/packet/PacketInclude.h b/src/network/packet/PacketInclude.h
index 09aeae8..ff884d2 100755
--- a/src/network/packet/PacketInclude.h
+++ b/src/network/packet/PacketInclude.h
@@ -50,5 +50,7 @@
 #include "TileEventPacket.h"
 #include "UpdateBlockPacket.h"
 #include "UseItemPacket.h"
-
+#include "RemoveItemPacket.h"
+#include "WantCreatePacket.h"
+#include "TakeItemPacket.h"
 #endif /*NET_MINECRAFT_NETWORK_PACKET__PacketInclude_H__*/
diff --git a/src/network/packet/RemoveItemPacket.h b/src/network/packet/RemoveItemPacket.h
new file mode 100644
index 0000000..f4a1d0a
--- /dev/null
+++ b/src/network/packet/RemoveItemPacket.h
@@ -0,0 +1,54 @@
+#ifndef NET_MINECRAFT_NETWORK_PACKET__RemoveItemPacket_H__
+#define NET_MINECRAFT_NETWORK_PACKET__RemoveItemPacket_H__
+
+//package net.minecraft.network.packet;
+
+#include "../Packet.h"
+
+class RemoveItemPacket: public Packet
+{
+public:
+    RemoveItemPacket() {
+    }
+
+    RemoveItemPacket(int playerId, int count, int auxValue, int itemId)
+	:
+		playerId(playerId),
+        count(count),
+		auxValue(auxValue),
+		itemId(itemId)
+	{
+    }
+
+	void write(RakNet::BitStream* bitStream)
+	{
+		bitStream->Write((RakNet::MessageID)(ID_USER_PACKET_ENUM + PACKET_REMOVEITEM));
+		bitStream->Write(itemId);
+		bitStream->Write(count);
+		bitStream->Write(auxValue);
+
+		bitStream->Write(playerId);
+	}
+
+	void read(RakNet::BitStream* bitStream)
+	{
+        bitStream->Read(itemId);
+        bitStream->Read(count);
+        bitStream->Read(auxValue);
+
+		bitStream->Read(playerId);
+	}
+
+	void handle(const RakNet::RakNetGUID& source, NetEventCallback* callback)
+	{
+		callback->handle(source, (RemoveItemPacket*)this);
+	}
+    
+    int playerId;
+
+    int itemId;
+	int count;
+	int auxValue;
+};
+
+#endif /*NET_MINECRAFT_NETWORK_PACKET__RemoveItemPacket_H__*/
diff --git a/src/network/packet/TakeItemPacket.h b/src/network/packet/TakeItemPacket.h
new file mode 100644
index 0000000..17eee0f
--- /dev/null
+++ b/src/network/packet/TakeItemPacket.h
@@ -0,0 +1,54 @@
+#ifndef NET_MINECRAFT_NETWORK_PACKET__TakeItemPacket_H__
+#define NET_MINECRAFT_NETWORK_PACKET__TakeItemPacket_H__
+
+//package net.minecraft.network.packet;
+
+#include "../Packet.h"
+
+class TakeItemPacket: public Packet
+{
+public:
+    TakeItemPacket() {
+    }
+
+    TakeItemPacket(int playerId, int count, int auxValue, int itemId)
+	:
+		playerId(playerId),
+        count(count),
+		auxValue(auxValue),
+		itemId(itemId)
+	{
+    }
+
+	void write(RakNet::BitStream* bitStream)
+	{
+		bitStream->Write((RakNet::MessageID)(ID_USER_PACKET_ENUM + PACKET_TAKEITEM));
+		bitStream->Write(itemId);
+		bitStream->Write(count);
+		bitStream->Write(auxValue);
+
+		bitStream->Write(playerId);
+	}
+
+	void read(RakNet::BitStream* bitStream)
+	{
+        bitStream->Read(itemId);
+        bitStream->Read(count);
+        bitStream->Read(auxValue);
+
+		bitStream->Read(playerId);
+	}
+
+	void handle(const RakNet::RakNetGUID& source, NetEventCallback* callback)
+	{
+		callback->handle(source, (TakeItemPacket*)this);
+	}
+    
+    int playerId;
+
+    int itemId;
+	int count;
+	int auxValue;
+};
+
+#endif /*NET_MINECRAFT_NETWORK_PACKET__TakeItemPacket_H__*/
diff --git a/src/network/packet/WantCreatePacket.h b/src/network/packet/WantCreatePacket.h
new file mode 100644
index 0000000..48873c5
--- /dev/null
+++ b/src/network/packet/WantCreatePacket.h
@@ -0,0 +1,54 @@
+#ifndef NET_MINECRAFT_NETWORK_PACKET__WantCreatePacket_H__
+#define NET_MINECRAFT_NETWORK_PACKET__WantCreatePacket_H__
+
+//package net.minecraft.network.packet;
+
+#include "../Packet.h"
+
+class WantCreatePacket: public Packet
+{
+public:
+    WantCreatePacket() {
+    }
+
+    WantCreatePacket(int playerId, int count, int auxValue, int itemId)
+	:
+		playerId(playerId),
+        count(count),
+		auxValue(auxValue),
+		itemId(itemId)
+	{
+    }
+
+	void write(RakNet::BitStream* bitStream)
+	{
+		bitStream->Write((RakNet::MessageID)(ID_USER_PACKET_ENUM + PACKET_WANTCREATEITEM));
+		bitStream->Write(itemId);
+		bitStream->Write(count);
+		bitStream->Write(auxValue);
+
+		bitStream->Write(playerId);
+	}
+
+	void read(RakNet::BitStream* bitStream)
+	{
+        bitStream->Read(itemId);
+        bitStream->Read(count);
+        bitStream->Read(auxValue);
+
+		bitStream->Read(playerId);
+	}
+
+	void handle(const RakNet::RakNetGUID& source, NetEventCallback* callback)
+	{
+		callback->handle(source, (WantCreatePacket*)this);
+	}
+    
+    int playerId;
+
+    int itemId;
+	int count;
+	int auxValue;
+};
+
+#endif /*NET_MINECRAFT_NETWORK_PACKET__WantCreatePacket_H__*/