diff --git a/include/memory.h b/include/memory.h
index 23b5f53..19536fd 100644
--- a/include/memory.h
+++ b/include/memory.h
@@ -1,10 +1,8 @@
 #pragma once
 
-#include "stdint.h"
-
 #define NULL ((void*)0)
 
 void heap_init();
 
-void* malloc(size_t size);
+void* malloc();
 void free(void* ptr);
\ No newline at end of file
diff --git a/src/convert.c b/src/convert.c
index ed44d85..aa8fbf3 100644
--- a/src/convert.c
+++ b/src/convert.c
@@ -30,7 +30,7 @@ char* ultoa(unsigned long number, char* string, int base)
         return string;
     }
 
-    char* buffer = (char*)malloc(1024);
+    char* buffer = (char*)malloc();
     char* temp = buffer;
 
     int i = 0;
diff --git a/src/memory.c b/src/memory.c
index 5e4445c..cf4c196 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -1,11 +1,11 @@
 #include "memory.h"
 
+#include "stdint.h"
 #include "io.h"
 #include "convert.h"
 
 struct FreeBlock
 {
-    size_t size;
     struct FreeBlock* next;
 };
 
@@ -15,66 +15,63 @@ struct Block
     void* data;
 };
 
-extern const void* __heap_base;
+#define BLOCK_SIZE 4096
+#define MAGIC_NUMBER 0xdeadbeef
+
+extern char __heap_base;
 static struct FreeBlock* head = NULL;
 
 void heap_init()
 {
-    head = (struct FreeBlock*)__heap_base;
-    head->next = head + sizeof(struct FreeBlock);
-    head->size = 0;
-
-    head->next->next = NULL;
-    head->next->size = -1;
+    head = (struct FreeBlock*)&__heap_base;
+    head->next = NULL;
 }
 
-struct FreeBlock* find_free_block(struct FreeBlock** previous, size_t min_size)
+void* malloc()
 {
-    struct FreeBlock* block = head;
-    while(block && min_size < block->size)
+    void* block = (void*)head;
+
+    if(head->next == NULL)
     {
-        *previous = block;
-        block = block->next;
-    }
-
-    return block;
-}
-
-void* malloc(size_t size)
-{
-    size_t physicalSize = size + sizeof(size_t);
-    struct Block* allocation = NULL;
-
-    struct FreeBlock* previous = head;
-    struct FreeBlock* block = find_free_block(&previous, physicalSize);
-
-    allocation = (struct Block*)block;
-    allocation->size = size;
-
-    if(block->size == physicalSize)
-    {
-        previous->next = block->next;
+        head += BLOCK_SIZE;
+        head->next = NULL;
     }
     else
     {
-        struct FreeBlock* shrunkBlock = block + physicalSize;
-        shrunkBlock->next = block->next;
-        shrunkBlock->size = shrunkBlock->next - shrunkBlock;
-
-        previous->next = shrunkBlock;
+        head = head->next;
     }
 
-    return &(allocation->data);
+    *(uint32_t*)block = MAGIC_NUMBER;
+    return block + sizeof(uint32_t);
 }
 
 void free(void* ptr)
 {
-    struct FreeBlock* block = (struct FreeBlock*)((size_t*)ptr - 1);
-    
-    struct FreeBlock* previous = head;
-    while(previous && (void*)previous->next < ptr)
-        previous = previous->next; 
+    void* blockStart = ptr - sizeof(uint32_t);
+    if(*(uint32_t*)blockStart != MAGIC_NUMBER)
+        return;
 
-    previous->next = block;
-    block->next = previous;
+    if((struct FreeBlock*)blockStart < head)
+    {
+        struct FreeBlock* nextBlock = head->next;
+        head = blockStart;
+        head->next = nextBlock;
+        return;
+    }
+
+    struct FreeBlock* block = head;
+
+    while(block)
+    {
+        if(block < (struct FreeBlock*)blockStart && (struct FreeBlock*)blockStart < block->next)
+        {
+            struct FreeBlock* newBlock = (struct FreeBlock*)blockStart;
+            newBlock->next = block->next;
+            block->next = newBlock;
+
+            return;
+        }
+
+        block = block->next;
+    }
 }
\ No newline at end of file