diff --git a/src/API/BlockAPI.php b/src/API/BlockAPI.php
index 4959cf809..6136e8a5c 100644
--- a/src/API/BlockAPI.php
+++ b/src/API/BlockAPI.php
@@ -58,10 +58,10 @@ class BlockAPI{
 			PLANKS => "PlanksBlock",
 			SAPLING => "SaplingBlock",
 			BEDROCK => "BedrockBlock",
-			/*WATER => (new GenericBlock(WATER, 0, "")),
-			STILL_WATER => (new GenericBlock(STILL_WATER, 0, "")),
-			LAVA => (new GenericBlock(LAVA, 0, "")),
-			STILL_LAVA => (new GenericBlock(STILL_LAVA, 0, "")),*/
+			WATER => "WaterBlock",
+			STILL_WATER => "StillWaterBlock",
+			LAVA => "LavaBlock",
+			STILL_LAVA => "StillLavaBlock",
 			SAND => "SandBlock",
 			GRAVEL => "GravelBlock",
 			GOLD_ORE => "GoldOreBlock",
diff --git a/src/classes/material/Block.php b/src/classes/material/Block.php
index 8cd91f93c..b33ab8b9f 100644
--- a/src/classes/material/Block.php
+++ b/src/classes/material/Block.php
@@ -40,6 +40,7 @@ abstract class Block{
 	public $isPlaceable = true;
 	public $inWorld = false;
 	public $hasPhysics = false;
+	public $isLiquid = false;
 	public $v = false;
 	
 	public function __construct($id, $meta = 0, $name = "Unknown"){
@@ -63,7 +64,7 @@ abstract class Block{
 	
 	final public function position(Vector3 $v){
 		$this->inWorld = true;
-		$this->position = new Vector3((int) $v->x, (int) $v->y, (int) $v->z);
+		$this->v = new Vector3((int) $v->x, (int) $v->y, (int) $v->z);
 	}
 	
 	public function getDrops(Item $item, Player $player){
diff --git a/src/classes/material/block/LiquidBlock.php b/src/classes/material/block/LiquidBlock.php
new file mode 100644
index 000000000..14529b2ae
--- /dev/null
+++ b/src/classes/material/block/LiquidBlock.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+
+           -
+         /   \
+      /         \
+   /   PocketMine  \
+/          MP         \
+|\     @shoghicp     /|
+|.   \           /   .|
+| ..     \   /     .. |
+|    ..    |    ..    |
+|       .. | ..       |
+\          |          /
+   \       |       /
+      \    |    /
+         \ | /
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+
+*/
+
+class LiquidBlock extends TransparentBlock{
+	public function __construct($id, $meta = 0, $name = "Unknown"){
+		parent::__construct($id, $meta, $name);
+		$this->isLiquid = true;
+	}
+}
\ No newline at end of file
diff --git a/src/classes/material/block/liquid/Lava.php b/src/classes/material/block/liquid/Lava.php
new file mode 100644
index 000000000..0116d8b57
--- /dev/null
+++ b/src/classes/material/block/liquid/Lava.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+
+           -
+         /   \
+      /         \
+   /   PocketMine  \
+/          MP         \
+|\     @shoghicp     /|
+|.   \           /   .|
+| ..     \   /     .. |
+|    ..    |    ..    |
+|       .. | ..       |
+\          |          /
+   \       |       /
+      \    |    /
+         \ | /
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+
+*/
+
+class LavaBlock extends LiquidBlock{
+	public function __construct($meta = 0){
+		parent::__construct(LAVA, $meta, "Lava");
+	}
+	
+}
\ No newline at end of file
diff --git a/src/classes/material/block/liquid/StillLava.php b/src/classes/material/block/liquid/StillLava.php
new file mode 100644
index 000000000..9983d9bcc
--- /dev/null
+++ b/src/classes/material/block/liquid/StillLava.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+
+           -
+         /   \
+      /         \
+   /   PocketMine  \
+/          MP         \
+|\     @shoghicp     /|
+|.   \           /   .|
+| ..     \   /     .. |
+|    ..    |    ..    |
+|       .. | ..       |
+\          |          /
+   \       |       /
+      \    |    /
+         \ | /
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+
+*/
+
+class StillLavaBlock extends LiquidBlock{
+	public function __construct($meta = 0){
+		parent::__construct(STILL_LAVA, $meta, "Still Lava");
+	}
+	
+}
\ No newline at end of file
diff --git a/src/classes/material/block/liquid/StillWater.php b/src/classes/material/block/liquid/StillWater.php
new file mode 100644
index 000000000..3bcf5e915
--- /dev/null
+++ b/src/classes/material/block/liquid/StillWater.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+
+           -
+         /   \
+      /         \
+   /   PocketMine  \
+/          MP         \
+|\     @shoghicp     /|
+|.   \           /   .|
+| ..     \   /     .. |
+|    ..    |    ..    |
+|       .. | ..       |
+\          |          /
+   \       |       /
+      \    |    /
+         \ | /
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+
+*/
+
+class StillWaterBlock extends LiquidBlock{
+	public function __construct($meta = 0){
+		parent::__construct(STILL_WATER, $meta, "Still Water");
+	}
+	
+}
\ No newline at end of file
diff --git a/src/classes/material/block/liquid/Water.php b/src/classes/material/block/liquid/Water.php
new file mode 100644
index 000000000..980fceb6b
--- /dev/null
+++ b/src/classes/material/block/liquid/Water.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+
+           -
+         /   \
+      /         \
+   /   PocketMine  \
+/          MP         \
+|\     @shoghicp     /|
+|.   \           /   .|
+| ..     \   /     .. |
+|    ..    |    ..    |
+|       .. | ..       |
+\          |          /
+   \       |       /
+      \    |    /
+         \ | /
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+
+*/
+
+class WaterBlock extends LiquidBlock{
+	public function __construct($meta = 0){
+		parent::__construct(WATER, $meta, "Water");
+	}
+	
+}
\ No newline at end of file