diff --git a/include/input_state.h b/include/input_state.h
index 782b4b19c..711ad6338 100644
--- a/include/input_state.h
+++ b/include/input_state.h
@@ -34,6 +34,9 @@ extern struct pointer_state {
 		bool drag;
 		bool resize;
 	} floating;
+	struct pointer_tiling {
+		bool resize;
+	} tiling;
 	struct pointer_lock {
 		bool left;
 		bool right;
diff --git a/include/layout.h b/include/layout.h
index 566e32465..20044b953 100644
--- a/include/layout.h
+++ b/include/layout.h
@@ -18,7 +18,7 @@ swayc_t *replace_child(swayc_t *child, swayc_t *new_child);
 swayc_t *remove_child(swayc_t *child);
 
 // Layout
-void arrange_windows(swayc_t *container, int width, int height);
+void arrange_windows(swayc_t *container, double width, double height);
 
 // Focus
 void unfocus_all(swayc_t *container);
diff --git a/sway/handlers.c b/sway/handlers.c
index 5993223d3..a71328e3d 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -1,6 +1,7 @@
 #include <xkbcommon/xkbcommon.h>
 #include <stdlib.h>
 #include <stdbool.h>
+#include <math.h>
 #include <wlc/wlc.h>
 #include <ctype.h>
 
@@ -351,7 +352,7 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct
 		return false;
 	}
 	// Do checks to determine if proper keys are being held
-	swayc_t *view = get_focused_view(active_workspace);
+	swayc_t *view = container_under_pointer();
 	uint32_t edge = 0;
 	if (pointer_state.floating.drag && view) {
 		if (view->is_floating) {
@@ -426,6 +427,91 @@ static bool handle_pointer_motion(wlc_handle handle, uint32_t time, const struct
 					}
 				}
 			}
+		}	
+	} else if (pointer_state.tiling.resize && view) {
+		if (!view->is_floating) {
+			// Handle layout resizes -- Find the biggest parent container then apply resizes to that
+			// and its bordering siblings
+			swayc_t *parent = view;
+			double dx = mouse_origin.x - prev_pos.x;
+			double dy = mouse_origin.y - prev_pos.y;
+			if (pointer_state.lock.top) {
+				while (parent->type != C_WORKSPACE) {
+					// TODO: Absolute value is a bad hack here to compensate for rounding. Find a better
+					// way of doing this.
+					if (fabs(parent->parent->y + parent->parent->height - (view->y + view->height)) <= 1) {
+						parent = parent->parent;
+					} else {
+						break;
+					}
+				}
+				if (parent->parent->children->length > 1 && parent->parent->layout == L_VERT) {
+					sway_log(L_DEBUG, "Top is locked, found biggest valid parent at: %p", parent);
+					swayc_t *sibling = get_swayc_in_direction(parent, MOVE_DOWN);
+					if (sibling) {
+						sway_log(L_DEBUG, "Found sibling at: %p", sibling);
+						recursive_resize(parent, dy, WLC_RESIZE_EDGE_BOTTOM);
+						recursive_resize(sibling, -1 * dy, WLC_RESIZE_EDGE_TOP);
+					}
+				}
+			} else {
+				while (parent->type != C_WORKSPACE) {
+					if (fabs(parent->parent->y - view->y) <= 1) {
+						parent = parent->parent;
+					} else {
+						break;
+					}
+				}
+				if (parent->parent->children->length > 1 && parent->parent->layout == L_VERT) {
+					sway_log(L_DEBUG, "Bot is locked, found biggest valid parent at: %p", parent);
+					swayc_t *sibling = get_swayc_in_direction(parent, MOVE_UP);
+					if (sibling) {
+						sway_log(L_DEBUG, "Found sibling at: %p", sibling);
+						recursive_resize(parent, -1 * dy, WLC_RESIZE_EDGE_TOP);
+						recursive_resize(sibling, dy, WLC_RESIZE_EDGE_BOTTOM);
+					}
+				}
+			}
+
+			parent = view;
+			if (pointer_state.lock.left) {
+				while (parent->type != C_WORKSPACE) {
+					if (fabs(parent->parent->x + parent->parent->width - (view->x + view->width)) <= 1) {
+						parent = parent->parent;
+					} else {
+						sway_log(L_DEBUG, "view: %f vs parent: %f", view->x + view->width, parent->parent->x + parent->parent->width);
+						break;
+					}
+				}
+				sway_log(L_DEBUG, "Left is locked, found biggest valid parent at: %p", parent);
+				if (parent->parent->children->length > 1 && parent->parent->layout == L_HORIZ) {
+					sway_log(L_DEBUG, "Left is locked, found biggest valid parent at: %p", parent);
+					swayc_t *sibling = get_swayc_in_direction(parent, MOVE_RIGHT);
+					if (sibling) {
+						sway_log(L_DEBUG, "Found sibling at: %p", sibling);
+						recursive_resize(parent, dx, WLC_RESIZE_EDGE_RIGHT);
+						recursive_resize(sibling, -1 * dx, WLC_RESIZE_EDGE_LEFT);
+					}
+				}
+			} else {
+				while (parent->type != C_WORKSPACE) {
+					if (fabs(parent->parent->x - view->x) <= 1 && parent->parent) {
+						parent = parent->parent;
+					} else {
+						break;
+					}
+				}
+				if (parent->parent->children->length > 1 && parent->parent->layout == L_HORIZ) {
+					sway_log(L_DEBUG, "Right is locked, found biggest valid parent at: %p", parent);
+					swayc_t *sibling = get_swayc_in_direction(parent, MOVE_LEFT);
+					if (sibling) {
+						sway_log(L_DEBUG, "Found sibling at: %p", sibling);
+						recursive_resize(parent, -1 * dx, WLC_RESIZE_EDGE_LEFT);
+						recursive_resize(sibling, dx, WLC_RESIZE_EDGE_RIGHT);
+					}
+				}
+			}
+			arrange_windows(active_workspace, -1, -1);
 		}
 	}
 	if (config->focus_follows_mouse && prev_handle != handle) {
@@ -472,7 +558,16 @@ static bool handle_pointer_button(wlc_handle view, uint32_t time, const struct w
 			pointer_state.r_held = true;
 		}
 		swayc_t *pointer = container_under_pointer();
-		set_focused_container(pointer);
+		if (pointer) {
+			set_focused_container(pointer);
+			int midway_x = pointer->x + pointer->width/2;
+			int midway_y = pointer->y + pointer->height/2;
+			pointer_state.lock.bottom = origin->y < midway_y;
+			pointer_state.lock.top = !pointer_state.lock.bottom;
+			pointer_state.lock.right = origin->x < midway_x;
+			pointer_state.lock.left = !pointer_state.lock.right;
+		}
+
 		if (pointer->is_floating) {
 			int i;
 			for (i = 0; i < pointer->parent->floating->length; i++) {
@@ -484,19 +579,14 @@ static bool handle_pointer_button(wlc_handle view, uint32_t time, const struct w
 			}
 			arrange_windows(pointer->parent, -1, -1);
 			if (modifiers->mods & config->floating_mod) {
-				int midway_x = pointer->x + pointer->width/2;
-				int midway_y = pointer->y + pointer->height/2;
-
 				pointer_state.floating.drag = pointer_state.l_held;
 				pointer_state.floating.resize = pointer_state.r_held;
-				pointer_state.lock.bottom = origin->y < midway_y;
-				pointer_state.lock.top = !pointer_state.lock.bottom;
-				pointer_state.lock.right = origin->x < midway_x;
-				pointer_state.lock.left = !pointer_state.lock.right;
 				start_floating(pointer);
 			}
 			// Dont want pointer sent to window while dragging or resizing
 			return (pointer_state.floating.drag || pointer_state.floating.resize);
+		} else {
+			pointer_state.tiling.resize = pointer_state.r_held;
 		}
 		return (pointer && pointer != focused);
 	} else {
@@ -508,6 +598,7 @@ static bool handle_pointer_button(wlc_handle view, uint32_t time, const struct w
 		if (button == M_RIGHT_CLICK) {
 			pointer_state.r_held = false;
 			pointer_state.floating.resize = false;
+			pointer_state.tiling.resize = false;
 			pointer_state.lock = (struct pointer_lock){false ,false ,false ,false};
 		}
 	}
diff --git a/sway/input_state.c b/sway/input_state.c
index a7f88d4a6..e592cfc15 100644
--- a/sway/input_state.c
+++ b/sway/input_state.c
@@ -41,7 +41,7 @@ void release_key(keycode key) {
 	}
 }
 
-struct pointer_state pointer_state = {0, 0, {0, 0}, {0, 0, 0, 0}};
+struct pointer_state pointer_state = {0, 0, {0, 0}, {0}, {0, 0, 0, 0}};
 
 static struct wlc_geometry saved_floating;
 
@@ -65,4 +65,3 @@ void reset_floating(swayc_t *view) {
 	pointer_state.floating = (struct pointer_floating){0,0};
 	pointer_state.lock = (struct pointer_lock){0,0,0,0};
 }
-
diff --git a/sway/layout.c b/sway/layout.c
index 50e7b5925..12b279876 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -109,7 +109,7 @@ swayc_t *remove_child(swayc_t *child) {
 }
 
 
-void arrange_windows(swayc_t *container, int width, int height) {
+void arrange_windows(swayc_t *container, double width, double height) {
 	int i;
 	if (width == -1 || height == -1) {
 		sway_log(L_DEBUG, "Arranging layout for %p", container);
@@ -209,7 +209,7 @@ void arrange_windows(swayc_t *container, int width, int height) {
 			sway_log(L_DEBUG, "Arranging %p horizontally", container);
 			for (i = 0; i < container->children->length; ++i) {
 				swayc_t *child = container->children->items[i];
-				sway_log(L_DEBUG, "Calculating arrangement for %p:%d (will scale %d by %f)", child, child->type, width, scale);
+				sway_log(L_DEBUG, "Calculating arrangement for %p:%d (will scale %f by %f)", child, child->type, width, scale);
 				child->x = x + container->x;
 				child->y = y + container->y;
 				arrange_windows(child, child->width * scale, height);
@@ -236,7 +236,7 @@ void arrange_windows(swayc_t *container, int width, int height) {
 			sway_log(L_DEBUG, "Arranging %p vertically", container);
 			for (i = 0; i < container->children->length; ++i) {
 				swayc_t *child = container->children->items[i];
-				sway_log(L_DEBUG, "Calculating arrangement for %p:%d (will scale %d by %f)", child, child->type, height, scale);
+				sway_log(L_DEBUG, "Calculating arrangement for %p:%d (will scale %f by %f)", child, child->type, height, scale);
 				child->x = x + container->x;
 				child->y = y + container->y;
 				arrange_windows(child, width, child->height * scale);
diff --git a/sway/type b/sway/type
new file mode 100644
index 000000000..c7bebe5e4
--- /dev/null
+++ b/sway/type
@@ -0,0 +1,113 @@
+workspace.c:78:9:	while (parent->type != C_OUTPUT) {
+workspace.c:79:12:		parent = parent->parent;
+
+focus.c:16:6:	if (parent->focused != c) {
+focus.c:30:8:			if (parent->focused) {
+focus.c:31:19:				swayc_t *ws = parent->focused;
+focus.c:38:25:				wlc_output_set_mask(parent->handle, 2);
+focus.c:39:8:				c->parent->focused = c;
+focus.c:53:5:	c->parent->focused = c;
+focus.c:71:20:	while (parent && !parent->is_focused) {
+focus.c:72:12:		parent = parent->focused;
+focus.c:143:13:		if (find->parent->focused != find) {
+focus.c:167:19:	while (parent && parent->type != C_VIEW) {
+focus.c:168:7:		if (parent->type == C_WORKSPACE && parent->focused == NULL) {
+focus.c:171:12:		parent = parent->focused;
+
+handlers.c:24:9:	while (parent->type != C_OUTPUT) {
+handlers.c:25:12:		parent = parent->parent;
+handlers.c:436:18:				while (parent->parent && parent->y + parent->height == view->y + view->height && parent->type != L_WORKSPACE) {
+handlers.c:437:30:					parent = parent->parent;
+handlers.c:440:50:				if (parent == &root_container || parent->children->length == 1) {
+handlers.c:444:18:				while (parent->parent && parent->y == view->y) {
+handlers.c:445:30:					parent = parent->parent;
+handlers.c:448:50:				if (parent == &root_container || parent->children->length == 1) {
+handlers.c:454:18:				while (parent->parent && parent->x + parent->width == view->x + view->width) {
+handlers.c:455:30:					parent = parent->parent;
+handlers.c:458:50:				if (parent == &root_container || parent->children->length == 1) {
+handlers.c:462:18:				while (parent->parent && parent->x + parent->width == view->x) {
+handlers.c:463:30:					parent = parent->parent;
+handlers.c:466:50:				if (parent == &root_container || parent->children->length == 1) {
+handlers.c:528:29:			for (i = 0; i < pointer->parent->floating->length; i++) {
+handlers.c:529:18:				if (pointer->parent->floating->items[i] == pointer) {
+handlers.c:530:24:					list_del(pointer->parent->floating, i);
+handlers.c:531:24:					list_add(pointer->parent->floating, pointer);
+
+container.c:284:6:	if (parent->type == C_CONTAINER) {
+
+layout.c:23:18:	for (i = 0; i < parent->children->length; ++i) {
+layout.c:24:7:		if (parent->children->items[i] == child) {
+layout.c:33:40:		child->width, child->height, parent, parent->type, parent->width, parent->height);
+layout.c:34:11:	list_add(parent->children, child);
+layout.c:37:6:	if (parent->children->length == 1) {
+layout.c:56:11:	if (i == parent->children->length) {
+layout.c:59:14:	list_insert(parent->children, i+1, child);
+layout.c:70:2:	parent->children->items[i] = new_child;
+layout.c:73:13:	if (child->parent->focused == child) {
+layout.c:85:19:		for (i = 0; i < parent->floating->length; ++i) {
+layout.c:86:8:			if (parent->floating->items[i] == child) {
+layout.c:87:14:				list_del(parent->floating, i);
+layout.c:93:19:		for (i = 0; i < parent->children->length; ++i) {
+layout.c:94:8:			if (parent->children->items[i] == child) {
+layout.c:95:14:				list_del(parent->children, i);
+layout.c:101:6:	if (parent->focused == child) {
+layout.c:102:7:		if (parent->children->length > 0) {
+layout.c:103:38:			set_focused_container_for(parent, parent->children->items[i?i-1:0]);
+layout.c:105:4:			parent->focused = NULL;
+layout.c:165:12:				while (parent->type != C_OUTPUT) {
+layout.c:166:15:					parent = parent->parent;
+layout.c:170:23:				geometry.size.w = parent->width;
+layout.c:171:23:				geometry.size.h = parent->height;
+layout.c:267:13:					while (parent->type != C_OUTPUT) {
+layout.c:268:16:						parent = parent->parent;
+layout.c:272:24:					geometry.size.w = parent->width;
+layout.c:273:24:					geometry.size.h = parent->height;
+layout.c:294:6:	if (parent->children == NULL) {
+layout.c:300:6:	if (parent->type == C_WORKSPACE) {
+layout.c:301:19:		for (i = 0; i < parent->floating->length; ++i) {
+layout.c:302:21:			swayc_t *child = parent->floating->items[i];
+layout.c:309:18:	for (i = 0; i < parent->children->length; ++i) {
+layout.c:310:20:		swayc_t *child = parent->children->items[i];
+layout.c:327:7:		if (parent->type == C_OUTPUT) {
+layout.c:338:8:			if (parent->layout == L_HORIZ || parent->type == C_ROOT) {
+layout.c:343:8:			if (parent->layout == L_VERT) {
+layout.c:350:20:			for (i = 0; i < parent->children->length; ++i) {
+layout.c:351:22:				swayc_t *child = parent->children->items[i];
+layout.c:357:34:			if (desired < 0 || desired >= parent->children->length) {
+layout.c:360:12:				return parent->children->items[desired];
+layout.c:365:13:			parent = parent->parent;
+
+commands.c:394:9:	while (parent->type == C_VIEW) {
+commands.c:395:12:		parent = parent->parent;
+commands.c:399:3:		parent->layout = L_HORIZ;
+commands.c:401:3:		parent->layout = L_VERT;
+commands.c:403:7:		if (parent->layout == L_VERT) {
+commands.c:404:4:			parent->layout = L_HORIZ;
+commands.c:406:4:			parent->layout = L_VERT;
+commands.c:409:26:	arrange_windows(parent, parent->width, parent->height);
+commands.c:454:10:		while (parent->parent) {
+commands.c:455:8:			if (parent->parent->layout == L_HORIZ) {
+commands.c:456:21:				for (i = 0; i < parent->parent->children->length; i++) {
+commands.c:457:16:					sibling = parent->parent->children->items[i];
+commands.c:459:24:						if (sibling->x < parent->x) {
+commands.c:461:31:						} else if (sibling->x > parent->x) {
+commands.c:470:13:			parent = parent->parent;
+commands.c:475:87:		sway_log(L_DEBUG, "Found the proper parent: %p. It has %d l conts, and %d r conts", parent->parent, lnumber, rnumber);
+commands.c:477:19:		for (i = 0; i < parent->parent->children->length; i++) {
+commands.c:478:14:			sibling = parent->parent->children->items[i];
+commands.c:480:22:				if (sibling->x < parent->x) {
+commands.c:488:29:				} else if (sibling->x > parent->x) {
+commands.c:517:10:		while (parent->parent) {
+commands.c:518:8:			if (parent->parent->layout == L_VERT) {
+commands.c:519:21:				for (i = 0; i < parent->parent->children->length; i++) {
+commands.c:520:16:					sibling = parent->parent->children->items[i];
+commands.c:522:24:						if (sibling->y < parent->y) {
+commands.c:524:31:						} else if (sibling->y > parent->y) {
+commands.c:533:13:			parent = parent->parent;
+commands.c:538:87:		sway_log(L_DEBUG, "Found the proper parent: %p. It has %d b conts, and %d t conts", parent->parent, bnumber, tnumber);
+commands.c:540:19:		for (i = 0; i < parent->parent->children->length; i++) {
+commands.c:541:14:			sibling = parent->parent->children->items[i];
+commands.c:543:22:				if (sibling->y < parent->y) {
+commands.c:551:29:				} else if (sibling->x > parent->x) {
+commands.c:603:54:	} else if (focused->type != C_WORKSPACE && focused->parent->children->length == 1) {
+commands.c:606:12:		focused->parent->layout = layout;