diff --git a/examples/HelloWorld.js b/examples/HelloWorld.js
index f4d112b..269bde6 100644
--- a/examples/HelloWorld.js
+++ b/examples/HelloWorld.js
@@ -17,6 +17,10 @@ const app = uWS./*SSL*/App({
   },
   message: (ws, message, isBinary) => {
     ws.send(message, isBinary);
+
+    console.log('BufferedAmount is ' + ws.getBufferedAmount());
+
+    ws.close();
   },
   drain: (ws) => {
     console.log('WebSocket drained');
diff --git a/src/WebSocketWrapper.h b/src/WebSocketWrapper.h
index c6cb765..2d98158 100644
--- a/src/WebSocketWrapper.h
+++ b/src/WebSocketWrapper.h
@@ -6,17 +6,44 @@ using namespace v8;
 struct WebSocketWrapper {
     static Persistent<Object> wsTemplate[2];
 
-    // ws.getBufferedAmount()
-    // ws.close(lalala)
-    // ws.?
+    template <bool SSL>
+    static inline uWS::WebSocket<SSL, true> *getWebSocket(const FunctionCallbackInfo<Value> &args) {
+        return ((uWS::WebSocket<SSL, true> *) args.Holder()->GetAlignedPointerFromInternalField(0));
+    }
 
+    /* Takes code, message, returns undefined */
+    template <bool SSL>
+    static void uWS_WebSocket_close(const FunctionCallbackInfo<Value> &args) {
+        int code = 0;
+        std::string_view message;
+
+        if (args.Length() >= 1) {
+            code = args[0]->Uint32Value();
+        }
+
+        if (args.Length() >= 2) {
+            NativeString nativeString(args.GetIsolate(), args[1]);
+            message = {nativeString.getData(), nativeString.getLength()};
+        }
+
+        getWebSocket<SSL>(args)->close(code, message);
+    }
+
+    /* Takes nothing, returns integer */
+    template <bool SSL>
+    static void uWS_WebSocket_getBufferedAmount(const FunctionCallbackInfo<Value> &args) {
+        int bufferedAmount = getWebSocket<SSL>(args)->getBufferedAmount();
+        args.GetReturnValue().Set(Integer::New(isolate, bufferedAmount));
+    }
+
+    /* Takes message, isBinary. Returns true on success, false otherwise */
     template <bool SSL>
     static void uWS_WebSocket_send(const FunctionCallbackInfo<Value> &args) {
         NativeString nativeString(args.GetIsolate(), args[0]);
 
-        bool isBinary = args[1]->Int32Value();
+        bool isBinary = args[1]->BooleanValue();
 
-        bool ok = ((uWS::WebSocket<SSL, true> *) args.Holder()->GetAlignedPointerFromInternalField(0))->send(
+        bool ok = getWebSocket<SSL>(args)->send(
                     std::string_view(nativeString.getData(), nativeString.getLength()), isBinary ? uWS::OpCode::BINARY : uWS::OpCode::TEXT
                     );
 
@@ -32,16 +59,23 @@ struct WebSocketWrapper {
             wsTemplateLocal->SetClassName(String::NewFromUtf8(isolate, "uWS.WebSocket"));
         }
         wsTemplateLocal->InstanceTemplate()->SetInternalFieldCount(1);
-        wsTemplateLocal->PrototypeTemplate()->Set(String::NewFromUtf8(isolate, "send"), FunctionTemplate::New(isolate, uWS_WebSocket_send<SSL>));
 
+        /* Register our functions */
+        wsTemplateLocal->PrototypeTemplate()->Set(String::NewFromUtf8(isolate, "send"), FunctionTemplate::New(isolate, uWS_WebSocket_send<SSL>));
+        wsTemplateLocal->PrototypeTemplate()->Set(String::NewFromUtf8(isolate, "close"), FunctionTemplate::New(isolate, uWS_WebSocket_close<SSL>));
+        wsTemplateLocal->PrototypeTemplate()->Set(String::NewFromUtf8(isolate, "getBufferedAmount"), FunctionTemplate::New(isolate, uWS_WebSocket_getBufferedAmount<SSL>));
+
+        /* Create the template */
         Local<Object> wsObjectLocal = wsTemplateLocal->GetFunction()->NewInstance(isolate->GetCurrentContext()).ToLocalChecked();
         wsTemplate[SSL].Reset(isolate, wsObjectLocal);
     }
 
+    /* This is where we output an instance */
     template <class APP>
     static Local<Object> getWsInstance() {
         return Local<Object>::New(isolate, wsTemplate[std::is_same<APP, uWS::SSLApp>::value])->Clone();
     }
 };
 
+/* Fix this, should be nicer */
 Persistent<Object> WebSocketWrapper::wsTemplate[2];