diff --git a/FlubberView.xcodeproj/project.pbxproj b/FlubberView.xcodeproj/project.pbxproj
index 7dd13fe..269e288 100644
--- a/FlubberView.xcodeproj/project.pbxproj
+++ b/FlubberView.xcodeproj/project.pbxproj
@@ -124,7 +124,6 @@
 		B53AF9421D8F41CE00E881DB /* FlubberView */ = {
 			isa = PBXGroup;
 			children = (
-				B53AF95C1D8F514A00E881DB /* Classes */,
 				B5474CB51D970ADD00B9AA17 /* Flubber.swift */,
 				B53AF9431D8F41CE00E881DB /* FlubberView.h */,
 				B53AF95A1D8F50C300E881DB /* FlubberView.swift */,
@@ -143,13 +142,6 @@
 			path = FlubberViewTests;
 			sourceTree = "<group>";
 		};
-		B53AF95C1D8F514A00E881DB /* Classes */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Classes;
-			sourceTree = "<group>";
-		};
 		B5474CA41D97050700B9AA17 /* FlubberView Example */ = {
 			isa = PBXGroup;
 			children = (
@@ -241,18 +233,19 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 1010;
 				ORGANIZATIONNAME = "Nice Things";
 				TargetAttributes = {
 					B53AF93F1D8F41CE00E881DB = {
 						CreatedOnToolsVersion = 8.0;
 						DevelopmentTeam = 8LHVT7DW44;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Automatic;
 					};
 					B53AF9481D8F41CF00E881DB = {
 						CreatedOnToolsVersion = 8.0;
 						DevelopmentTeam = 8LHVT7DW44;
+						LastSwiftMigration = 1010;
 						ProvisioningStyle = Automatic;
 					};
 					B5474CA21D97050700B9AA17 = {
@@ -401,15 +394,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -455,15 +456,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -511,7 +520,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -532,7 +542,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicethings.FlubberView;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -545,7 +556,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicethings.FlubberViewTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -558,7 +570,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.nicethings.FlubberViewTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
diff --git a/FlubberView.xcodeproj/xcshareddata/xcschemes/FlubberView Example.xcscheme b/FlubberView.xcodeproj/xcshareddata/xcschemes/FlubberView Example.xcscheme
index 32df7a3..112bd23 100644
--- a/FlubberView.xcodeproj/xcshareddata/xcschemes/FlubberView Example.xcscheme	
+++ b/FlubberView.xcodeproj/xcshareddata/xcschemes/FlubberView Example.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/FlubberView.xcodeproj/xcshareddata/xcschemes/FlubberView.xcscheme b/FlubberView.xcodeproj/xcshareddata/xcschemes/FlubberView.xcscheme
index f50fb02..1ce0ad2 100644
--- a/FlubberView.xcodeproj/xcshareddata/xcschemes/FlubberView.xcscheme
+++ b/FlubberView.xcodeproj/xcshareddata/xcschemes/FlubberView.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/FlubberView.xcodeproj/xcuserdata/matthewbuckley.xcuserdatad/xcschemes/FlubberViewTests.xcscheme b/FlubberView.xcodeproj/xcuserdata/matthewbuckley.xcuserdatad/xcschemes/FlubberViewTests.xcscheme
index 06350e2..3a0455f 100644
--- a/FlubberView.xcodeproj/xcuserdata/matthewbuckley.xcuserdatad/xcschemes/FlubberViewTests.xcscheme
+++ b/FlubberView.xcodeproj/xcuserdata/matthewbuckley.xcuserdatad/xcschemes/FlubberViewTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/FlubberView/Flubber.swift b/FlubberView/Flubber.swift
index b328cc5..01b64a9 100644
--- a/FlubberView/Flubber.swift
+++ b/FlubberView/Flubber.swift
@@ -13,7 +13,6 @@ public protocol Initializable {
     init()
 }
 
-
 /// Used to specify the number of nodes to be
 /// distributed inside the FlubberView
 ///
diff --git a/FlubberView/FlubberView.swift b/FlubberView/FlubberView.swift
index 21d4d36..741217a 100644
--- a/FlubberView/FlubberView.swift
+++ b/FlubberView/FlubberView.swift
@@ -100,7 +100,7 @@ public extension FlubberView {
         super.didMoveToSuperview()
         setupMainLayer()
         displayLink = CADisplayLink(target: self, selector: #selector(FlubberView.redraw))
-        displayLink.add(to: RunLoop.main, forMode: RunLoopMode.defaultRunLoopMode)
+        displayLink.add(to: RunLoop.main, forMode: RunLoop.Mode.default)
     }
     
     @objc func redraw() {
@@ -256,16 +256,16 @@ private extension FlubberView {
                              y: topEdgeRight.y + cornerRadius)
             bPath.addArc(withCenter: center,
                          radius: cornerRadius,
-                         startAngle: CGFloat(-M_PI_2),
-                         endAngle: CGFloat(M_PI_2),
+                         startAngle: CGFloat(-Double.pi / 2),
+                         endAngle: CGFloat(Double.pi / 2),
                          clockwise: true)
             
             center = CGPoint(x: topEdgeLeft.x,
                              y: topEdgeLeft.y + cornerRadius)
             bPath.addArc(withCenter: center,
                          radius: cornerRadius,
-                         startAngle: CGFloat(M_PI_2),
-                         endAngle: CGFloat(-M_PI_2),
+                         startAngle: CGFloat(Double.pi / 2),
+                         endAngle: CGFloat(-Double.pi / 2),
                          clockwise: true)
         } else if desiredSize.width <= cornerRadius * 2.1 {
             bPath.move(to: rightEdgeTop)
@@ -273,7 +273,7 @@ private extension FlubberView {
                              y: topEdgeLeft.y + cornerRadius)
             bPath.addArc(withCenter: center,
                          radius: cornerRadius,
-                         startAngle: CGFloat(-M_PI),
+                         startAngle: CGFloat(-Double.pi),
                          endAngle: CGFloat(0.0),
                          clockwise: true)
             bPath.addQuadCurve(to: rightEdgeBottom, controlPoint: subviews[controlNodeIndices[1]].center)
@@ -283,7 +283,7 @@ private extension FlubberView {
             bPath.addArc(withCenter: center,
                          radius: cornerRadius,
                          startAngle: CGFloat(0.0),
-                         endAngle: CGFloat(-M_PI),
+                         endAngle: CGFloat(-Double.pi),
                          clockwise: true)
             bPath.addQuadCurve(to: leftEdgeTop, controlPoint: subviews[controlNodeIndices[3]].center)
         } else {
@@ -294,7 +294,7 @@ private extension FlubberView {
                              y: topEdgeRight.y + cornerRadius)
             bPath.addArc(withCenter: center,
                          radius: cornerRadius,
-                         startAngle: CGFloat(M_PI_2),
+                         startAngle: CGFloat(Double.pi / 2),
                          endAngle: 0.0,
                          clockwise: true)
             
@@ -307,7 +307,7 @@ private extension FlubberView {
             bPath.addArc(withCenter: center,
                          radius: cornerRadius,
                          startAngle: 0,
-                         endAngle: CGFloat(M_PI_2),
+                         endAngle: CGFloat(Double.pi / 2),
                          clockwise: true)
             
             // move to the left end of the bottom edge through the center point of
@@ -317,8 +317,8 @@ private extension FlubberView {
                              y: subviews[cornerNodeIndices[3]].center.y - cornerRadius)
             bPath.addArc(withCenter: center,
                          radius: cornerRadius,
-                         startAngle: CGFloat(-M_PI_4),
-                         endAngle: CGFloat(M_PI),
+                         startAngle: CGFloat(-Double.pi / 4),
+                         endAngle: CGFloat(Double.pi),
                          clockwise: true)
             
             // move to the top end of the left edgee through the center point of
@@ -328,8 +328,8 @@ private extension FlubberView {
                              y: subviews[cornerNodeIndices[0]].center.y + cornerRadius)
             bPath.addArc(withCenter: center,
                          radius: cornerRadius,
-                         startAngle: CGFloat(M_PI),
-                         endAngle: CGFloat(M_PI_2),
+                         startAngle: CGFloat(Double.pi),
+                         endAngle: CGFloat(Double.pi / 2),
                          clockwise: true)
         }