diff --git a/Makefile b/Makefile
index c771d37..0fe1a42 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,50 @@
+LD = i686-elf-ld
+LFLAGS = -melf_i386 -nostdlib -O2 -T link.ld 
+
+all: prepare cpu kernel_code drivers libc shell link iso
+
+prepare:
+	mkdir -p obj/
+	mkdir -p isodir/boot/grub/
+	cp grub.cfg isodir/boot/grub/grub.cfg 
+
+cpu:
+	make -C kernel/cpu
+	cp kernel/cpu/*.o obj/
+
+kernel_code:
+	make -C kernel
+	cp kernel/*.o obj/
+
+drivers:
+	make -C kernel/drivers/
+	cp kernel/drivers/*.o obj/
+
+libc:
+	make -C kernel/libc
+	cp kernel/libc/*.o obj/
+
+shell:
+	make -C kernel/shell
+	cp kernel/shell/*.o obj/
+
+link:
+	$(LD) $(LFLAGS) -o isodir/boot/iceOS.bin obj/*.o
+
 iso:
 	grub-mkrescue isodir -o iceOS.iso
 
-run:
-	qemu-system-x86_64 -cdrom iceOS.iso
-
-run-curses:
-	qemu-system-x86_64 -cdrom iceOS.iso -curses
-
-bochs:
-	bochs -f bochs_cfg -q
-
 clean:
 	rm -rf obj/ kernel/*.o kernel/cpu/*.o
 	rm -rf kernel/shell/*.o
 	rm -rf kernel/drivers/*.o kernel/libc/*.o
 	rm -rf iceOS.iso bochslog.txt commands isodir
+
+bochs:
+	bochs -f bochs_cfg -q
+
+run:
+	qemu-system-x86_64 -cdrom iceOS:iso
+
+run-curses:
+	qemu-system-x86_64 -cdrom iceOS.iso -curses
\ No newline at end of file
diff --git a/grub.cfg b/grub.cfg
new file mode 100644
index 0000000..38bd850
--- /dev/null
+++ b/grub.cfg
@@ -0,0 +1,7 @@
+set timeout = 0
+set default = 0
+
+menuentry "iceOS" {
+	multiboot2 /boot/iceOS.bin
+	boot
+}
\ No newline at end of file