diff --git a/DV1572/DV1572/trolls_inn/Bobby test/Room/RoomCtrl.h b/DV1572/DV1572/trolls_inn/Bobby test/Room/RoomCtrl.h
@@ -2,22 +2,12 @@
 #include <vector>
 #include "Room.h"
 #include "Structure.h"
-#include "Kitchen.h"
-#include "Bedroom.h"
-#include "Reception.h"
 #include "../../Furniture/Furniture.h"
 
 
 
 const unsigned short ROOM_TYPE_SIZE = 2;
-enum RoomType {
-	kitchen,
-	hallway,
-	bedroom,
-	reception,
-	randomStupid,
-	UNDEFINED
-};
+
 
 const float WALLOFFSET = 0.5f;
 

diff --git a/DV1572/DV1572/trolls_inn/Furniture/Furniture.cpp b/DV1572/DV1572/trolls_inn/Furniture/Furniture.cpp
@@ -9,6 +9,8 @@ Furniture::Furniture(DirectX::XMFLOAT3 pos, Mesh * mesh)
 	this->pos.x = pos.x;
 	this->pos.y = pos.y;
 	this->pos.z = pos.z;
+
+	p_isBusy = false;
 }
 
 Furniture::~Furniture()
@@ -57,6 +59,16 @@ DirectX::XMINT3 Furniture::getPosition()
 	return this->pos;
 }
 
+bool Furniture::getIsBusy()
+{
+	return p_isBusy;
+}
+
+void Furniture::setIsBusy(bool busy)
+{
+	p_isBusy = busy;
+}
+
 int Furniture::getRotation()
 {
 	return p_rot;

diff --git a/DV1572/DV1572/trolls_inn/Furniture/Furniture.h b/DV1572/DV1572/trolls_inn/Furniture/Furniture.h
@@ -13,14 +13,17 @@ class Furniture
 	Attributes&	getAttributes();
 
 	int	getGridSize(); //gets the size this furniture will take up
+
+	void			setRotation(int rot);
+	int				getRotation();
 
 	void			setPosition(DirectX::XMFLOAT3 pos);
 	void			setPosition(float x, float y, float z);
-	void			setRotation(int rot);
-
 	DirectX::XMINT3 getPosition();
-	int				getRotation();
-
+
+	bool			getIsBusy();
+	void			setIsBusy(bool busy);
+
 	void LoadFurnitureStats(std::string path);
 
 	void Draw();
@@ -32,4 +35,6 @@ class Furniture
 	Attributes	p_attributes;
 	int			p_gridSize;
 	int			p_rot;
+
+	bool		p_isBusy;
 };