diff --git a/nalc_boats/depends.txt b/nalc_boats/depends.txt
new file mode 100644
index 0000000..8a4e32b
--- /dev/null
+++ b/nalc_boats/depends.txt
@@ -0,0 +1 @@
+boats
diff --git a/nalc_boats/init.lua b/nalc_boats/init.lua
new file mode 100644
index 0000000..350aa23
--- /dev/null
+++ b/nalc_boats/init.lua
@@ -0,0 +1,350 @@
+--
+-- Helper functions
+--
+
+local function is_water(pos)
+	local nn = minetest.get_node(pos).name
+	return minetest.get_item_group(nn, "water") ~= 0
+end
+
+
+local function get_sign(i)
+	if i == 0 then
+		return 0
+	else
+		return i / math.abs(i)
+	end
+end
+
+
+local function get_velocity(v, yaw, y)
+	local x = -math.sin(yaw) * v
+	local z =  math.cos(yaw) * v
+	return {x = x, y = y, z = z}
+end
+
+
+local function get_v(v)
+	return math.sqrt(v.x ^ 2 + v.z ^ 2)
+end
+
+local boat = {
+	physical = true,
+	-- Warning: Do not change the position of the collisionbox top surface,
+	-- lowering it causes the boat to fall through the world if underwater
+	collisionbox = {-0.5, -0.35, -0.5, 0.5, 0.3, 0.5},
+	visual = "mesh",
+	mesh = "boats_boat.obj",
+	textures = {"default_wood.png"},
+
+	driver = nil,
+	v = 0,
+	last_v = 0,
+	removed = false
+}
+
+-- define boats functions
+function boat.on_rightclick(self, clicker)
+	if not clicker or not clicker:is_player() then
+		return
+	end
+	local name = clicker:get_player_name()
+	if self.driver and clicker == self.driver then
+		self.driver = nil
+		clicker:set_detach()
+		default.player_attached[name] = false
+		default.player_set_animation(clicker, "stand" , 30)
+		local pos = clicker:getpos()
+		pos = {x = pos.x, y = pos.y + 0.2, z = pos.z}
+		minetest.after(0.1, function()
+			clicker:setpos(pos)
+		end)
+	elseif not self.driver then
+		local attach = clicker:get_attach()
+		if attach and attach:get_luaentity() then
+			local luaentity = attach:get_luaentity()
+			if luaentity.driver then
+				luaentity.driver = nil
+			end
+			clicker:set_detach()
+		end
+		self.driver = clicker
+		clicker:set_attach(self.object, "",
+			{x = 0, y = 11, z = -3}, {x = 0, y = 0, z = 0})
+		default.player_attached[name] = true
+		minetest.after(0.2, function()
+			default.player_set_animation(clicker, "sit" , 30)
+		end)
+		clicker:set_look_horizontal(self.object:getyaw())
+	end
+end
+
+
+function boat.on_activate(self, staticdata, dtime_s)
+	self.object:set_armor_groups({immortal = 1})
+	if staticdata then
+		self.v = tonumber(staticdata)
+	end
+	self.last_v = self.v
+end
+
+
+function boat.get_staticdata(self)
+	return tostring(self.v)
+end
+
+function boat.on_punch(self, puncher)
+	if not puncher or not puncher:is_player() or self.removed then
+		return
+	end
+	if self.driver and puncher == self.driver then
+		self.driver = nil
+		puncher:set_detach()
+		default.player_attached[puncher:get_player_name()] = false
+	end
+	if not self.driver then
+		self.removed = true
+		local inv = puncher:get_inventory()
+		if not (creative and creative.is_enabled_for
+					  and creative.is_enabled_for(puncher:get_player_name()))
+		or not inv:contains_item("main", "nalc_boats:"..self.parameters.name) then
+			local leftover = inv:add_item("main", "nalc_boats:"..self.parameters.name)
+			-- if no room in inventory add a replacement boat to the world
+			if not leftover:is_empty() then
+				minetest.add_item(self.object:getpos(), leftover)
+			end
+		end
+		-- delay remove to ensure player is detached
+		minetest.after(0.1, function()
+								self.object:remove()
+								  end)
+	end
+end
+
+function boat.on_step(self, dtime)
+	self.v = get_v(self.object:getvelocity()) * get_sign(self.v)
+	if self.driver then
+		local ctrl = self.driver:get_player_control()
+		local yaw = self.object:getyaw()
+		if ctrl.up then
+			self.v = self.v + self.parameters.controls.up or 0.1
+		elseif ctrl.down then
+			self.v = self.v - self.parameters.controls.down or 0.1
+		end
+		if ctrl.left then
+			if self.v < 0 then
+				self.object:setyaw(yaw - (1 + dtime) * (0.03 * (self.parameters.controls.rotate or 1)))
+			else
+				self.object:setyaw(yaw + (1 + dtime) * (0.03 * (self.parameters.controls.rotate or 1)))
+			end
+		elseif ctrl.right then
+			if self.v < 0 then
+				self.object:setyaw(yaw + (1 + dtime) * (0.03 * (self.parameters.controls.rotate or 1)))
+			else
+				self.object:setyaw(yaw - (1 + dtime) * (0.03 * (self.parameters.controls.rotate or 1)))
+			end
+		end
+	end
+	local velo = self.object:getvelocity()
+	if self.v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then
+		self.object:setpos(self.object:getpos())
+		return
+	end
+	local s = get_sign(self.v)
+	self.v = self.v - 0.02 * s
+	if s ~= get_sign(self.v) then
+		self.object:setvelocity({x = 0, y = 0, z = 0})
+		self.v = 0
+		return
+	end
+	if math.abs(self.v) > 5 then
+		self.v = 5 * get_sign(self.v)
+	end
+
+	local p = self.object:getpos()
+	p.y = p.y - 0.5
+	local new_velo
+	local new_acce = {x = 0, y = 0, z = 0}
+	if not is_water(p) then
+		local nodedef = minetest.registered_nodes[minetest.get_node(p).name]
+		if (not nodedef) or nodedef.walkable then
+			self.v = 0
+			new_acce = {x = 0, y = 1, z = 0}
+		else
+			new_acce = {x = 0, y = -9.8, z = 0}
+		end
+		new_velo = get_velocity(self.v, self.object:getyaw(),
+			self.object:getvelocity().y)
+		self.object:setpos(self.object:getpos())
+	else
+		p.y = p.y + 1
+		if is_water(p) then
+			local y = self.object:getvelocity().y
+			if y >= 5 then
+				y = 5
+			elseif y < 0 then
+				new_acce = {x = 0, y = 20, z = 0}
+			else
+				new_acce = {x = 0, y = 5, z = 0}
+			end
+			new_velo = get_velocity(self.v, self.object:getyaw(), y)
+			self.object:setpos(self.object:getpos())
+		else
+			new_acce = {x = 0, y = 0, z = 0}
+			if math.abs(self.object:getvelocity().y) < 1 then
+				local pos = self.object:getpos()
+				pos.y = math.floor(pos.y) + 0.5
+				self.object:setpos(pos)
+				new_velo = get_velocity(self.v, self.object:getyaw(), 0)
+			else
+				new_velo = get_velocity(self.v, self.object:getyaw(),
+					self.object:getvelocity().y)
+				self.object:setpos(self.object:getpos())
+			end
+		end
+	end
+	self.object:setvelocity(new_velo)
+	self.object:setacceleration(new_acce)
+end
+
+local register_boat = function(parameters)
+	minetest.register_entity(
+		"nalc_boats:"..parameters.name,
+		{
+			physical = boat.physical,
+			collisionbox = boat.collisionbox,
+			visual = boat.visual,
+			mesh = boat.mesh,
+			textures = {parameters.texture or boat.textures[1]},
+			parameters = parameters,
+			driver = boat.driver,
+			v = boat.v,
+			last_v = boat.last_v,
+			removed = boat.removed,
+
+			on_rightclick = boat.on_rightclick,
+			on_activate = boat.on_activate,
+			get_staticdata = boat.get_staticdata,
+			on_punch = boat.on_punch,
+			on_step = boat.on_step
+		})
+	
+	minetest.register_craftitem(
+		"nalc_boats:"..parameters.name,
+		{
+			description = parameters.description or "Boat",
+			inventory_image = "boats_"..parameters.name .. "_inventory.png",
+			wield_image = "boats_"..parameters.name.."_wield.png",
+			wield_scale = {x = 2, y = 2, z = 1},
+			liquids_pointable = true,
+			groups = {flammable = 2},
+
+			on_place = function(itemstack, placer, pointed_thing)
+				local under = pointed_thing.under
+				local node = minetest.get_node(under)
+				local udef = minetest.registered_nodes[node.name]
+				if udef and udef.on_rightclick and
+					not (placer and placer:is_player() and
+						  placer:get_player_control().sneak) then
+					return udef.on_rightclick(under, node, placer, itemstack,
+						pointed_thing) or itemstack
+				end
+				
+				if pointed_thing.type ~= "node" then
+					return itemstack
+				end
+				if not is_water(pointed_thing.under) then
+					return itemstack
+				end
+				pointed_thing.under.y = pointed_thing.under.y + 0.5
+				boat = minetest.add_entity(pointed_thing.under, "nalc_boats:"..parameters.name)
+				if boat then
+					if placer then
+						boat:setyaw(placer:get_look_horizontal())
+					end
+					local player_name = placer and placer:get_player_name() or ""
+					if not (creative and creative.is_enabled_for and
+							  creative.is_enabled_for(player_name)) then
+						itemstack:take_item()
+					end
+				end
+				return itemstack
+			end,
+		})
+end
+
+register_boat(
+	{ name = "race",
+	  texture = "default_gravel.png",
+	  controls =
+		  { up = 0.2,
+			 down = 0.18,
+			 rotate = 1
+		  },
+	  description = "Race boat"
+	})
+
+register_boat(
+	{ name = "expert_race",
+	  texture = "default_desert_stone.png",
+	  controls =
+		  { up = 0.25,
+			 down = 0.25,
+			 rotate = 4
+		  },
+	  description = "Expert race boat"
+	})
+
+register_boat(
+	{ name = "water",
+	  texture = "default_water.png",
+	  controls =
+		  { up = 0.3,
+			 down = 0.24,
+			 rotate = 4
+		  },
+	  description = "Water boat"
+	})
+
+register_boat(
+	{ name = "moon",
+	  texture = "boats_moon.png",
+	  controls =
+		  { up = 0.5,
+			 down = 0.1,
+			 rotate = 8
+		  },
+	  description = "Moon boat"
+	})
+
+minetest.register_craft(
+	{ output = "nalc_boats:moon",
+	  recipe = {
+		  {"default:obsidian", "", "default:obsidian"},
+		  {"default:dirt", "default:leaves", "default:dirt"},
+	  },
+	})
+
+minetest.register_craft(
+	{ output = "nalc_boats:expert_race",
+	  recipe = {
+		  {"default:desert_stone", "", "default:desert_stone"},
+		  {"default:desert_stone", "default:mese", "default:desert_stone"},
+	  },
+	})
+
+minetest.register_craft(
+	{ output = "nalc_boats:race",
+	  recipe = {
+		  {"default:gravel", "", "default:gravel"},
+		  {"default:gravel", "default:steelblock", "default:gravel"},
+	  },
+	})
+
+minetest.register_craft(
+	{ output = "nalc_boats:water",
+	  recipe = {
+		  {"default:glass", "", "default:glass"},
+		  {"default:glass", "bucket:bucket_water", "default:glass"},
+	  },
+	})
diff --git a/nalc_boats/textures/boats_boat_inventory.png b/nalc_boats/textures/boats_boat_inventory.png
new file mode 100755
index 0000000..e075663
Binary files /dev/null and b/nalc_boats/textures/boats_boat_inventory.png differ
diff --git a/nalc_boats/textures/boats_expert_race_inventory.png b/nalc_boats/textures/boats_expert_race_inventory.png
new file mode 100755
index 0000000..d39939a
Binary files /dev/null and b/nalc_boats/textures/boats_expert_race_inventory.png differ
diff --git a/nalc_boats/textures/boats_expert_race_wield.png b/nalc_boats/textures/boats_expert_race_wield.png
new file mode 100755
index 0000000..345dcd8
Binary files /dev/null and b/nalc_boats/textures/boats_expert_race_wield.png differ
diff --git a/nalc_boats/textures/boats_moon.png b/nalc_boats/textures/boats_moon.png
new file mode 100755
index 0000000..09597aa
Binary files /dev/null and b/nalc_boats/textures/boats_moon.png differ
diff --git a/nalc_boats/textures/boats_moon_inventory.png b/nalc_boats/textures/boats_moon_inventory.png
new file mode 100755
index 0000000..38d8910
Binary files /dev/null and b/nalc_boats/textures/boats_moon_inventory.png differ
diff --git a/nalc_boats/textures/boats_moon_wield.png b/nalc_boats/textures/boats_moon_wield.png
new file mode 100755
index 0000000..eb37ce2
Binary files /dev/null and b/nalc_boats/textures/boats_moon_wield.png differ
diff --git a/nalc_boats/textures/boats_race_inventory.png b/nalc_boats/textures/boats_race_inventory.png
new file mode 100755
index 0000000..d2b2980
Binary files /dev/null and b/nalc_boats/textures/boats_race_inventory.png differ
diff --git a/nalc_boats/textures/boats_race_wield.png b/nalc_boats/textures/boats_race_wield.png
new file mode 100755
index 0000000..385353f
Binary files /dev/null and b/nalc_boats/textures/boats_race_wield.png differ
diff --git a/nalc_boats/textures/boats_water_inventory.png b/nalc_boats/textures/boats_water_inventory.png
new file mode 100755
index 0000000..f744bae
Binary files /dev/null and b/nalc_boats/textures/boats_water_inventory.png differ
diff --git a/nalc_boats/textures/boats_water_wield.png b/nalc_boats/textures/boats_water_wield.png
new file mode 100755
index 0000000..b9196d9
Binary files /dev/null and b/nalc_boats/textures/boats_water_wield.png differ