diff --git a/kernel/src/interrupts/gdt.rs b/kernel/src/interrupts/gdt.rs
index 9719ebc..030e08d 100644
--- a/kernel/src/interrupts/gdt.rs
+++ b/kernel/src/interrupts/gdt.rs
@@ -73,7 +73,7 @@ pub fn init() {
 }
 
 #[inline(always)]
-pub unsafe fn set_usermode_segs() -> (u16, u16) {
+pub unsafe fn set_usermode_segments() -> (u16, u16) {
     use x86_64::instructions::segmentation::load_ds;
 
     // set ds ans tss, return cs and ds
diff --git a/kernel/src/interrupts/mod.rs b/kernel/src/interrupts/mod.rs
index bf148c1..7ec8f13 100644
--- a/kernel/src/interrupts/mod.rs
+++ b/kernel/src/interrupts/mod.rs
@@ -1,4 +1,4 @@
-use crate::{gdt, print, println};
+use crate::{gdt, print, println, scheduler};
 use lazy_static::lazy_static;
 use pic8259_simple::ChainedPics;
 use spin;
@@ -57,14 +57,20 @@ extern "x86-interrupt" fn double_fault_handler(
     stack_frame: &mut InterruptStackFrame,
     _error_code: u64,
 ) -> ! {
-    panic!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame);
+    panic!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame,);
 }
 
 extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: &mut InterruptStackFrame) {
     print!(".");
+
     unsafe {
+        let ctx = scheduler::get_context();
+        scheduler::SCHEDULER.save_current_context(ctx);
+
         PICS.lock()
             .notify_end_of_interrupt(InterruptIndex::Timer.as_u8());
+
+        scheduler::SCHEDULER.run_next();
     }
 }
 
diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs
index 762f7c8..c649ad8 100644
--- a/kernel/src/lib.rs
+++ b/kernel/src/lib.rs
@@ -18,9 +18,12 @@ pub mod allocator;
 pub mod gdt;
 pub mod interrupts;
 pub mod memory;
+pub mod scheduler;
 pub mod serial;
 pub mod syscalls;
 pub mod task;
+#[path = "scheduler/userspace.rs"]
+pub mod userspace;
 pub mod vga_buffer;
 
 pub fn init() {
diff --git a/kernel/src/main.rs b/kernel/src/main.rs
index e068fda..15e6251 100644
--- a/kernel/src/main.rs
+++ b/kernel/src/main.rs
@@ -9,7 +9,6 @@ extern crate alloc;
 use bootloader::{entry_point, BootInfo};
 use core::panic::PanicInfo;
 use kernel::println;
-use kernel::task::{executor::Executor, keyboard, Task};
 
 // panic handler
 #[cfg(not(test))]
@@ -30,10 +29,11 @@ fn panic(_info: &PanicInfo) -> ! {
 entry_point!(kernel_main);
 fn kernel_main(boot_info: &'static BootInfo) -> ! {
     use kernel::memory::BootInfoFrameAllocator;
-    use kernel::{allocator, memory, syscalls};
+    use kernel::task::{executor::Executor, keyboard, Task};
+    use kernel::{allocator, memory, scheduler, syscalls, userspace};
     use x86_64::VirtAddr;
 
-    println!("Hello World{}", "!");
+    println!("Welcome to RusticOS{}", "!");
     kernel::init();
 
     let phys_mem_offset = VirtAddr::new(boot_info.physical_memory_offset);
@@ -48,7 +48,25 @@ fn kernel_main(boot_info: &'static BootInfo) -> ! {
     #[cfg(test)]
     test_main();
 
-    let mut executor = Executor::new();
-    executor.spawn(Task::new(keyboard::print_keypresses()));
-    executor.run();
+    unsafe {
+        let scheduler = &scheduler::SCHEDULER;
+        scheduler.schedule(
+            &mut mapper,
+            VirtAddr::new(userspace::userspace_prog_1 as *const () as u64),
+            &mut frame_allocator,
+        );
+        scheduler.schedule(
+            &mut mapper,
+            VirtAddr::new(userspace::userspace_prog_2 as *const () as u64),
+            &mut frame_allocator,
+        );
+
+        loop {
+            scheduler.run_next();
+        }
+    }
+
+    // let mut executor = Executor::new();
+    // executor.spawn(Task::new(keyboard::print_keypresses()));
+    // executor.run();
 }
diff --git a/kernel/src/scheduler/mod.rs b/kernel/src/scheduler/mod.rs
index e69de29..6688318 100644
--- a/kernel/src/scheduler/mod.rs
+++ b/kernel/src/scheduler/mod.rs
@@ -0,0 +1,197 @@
+use crate::gdt;
+use alloc::boxed::Box;
+use alloc::vec::Vec;
+use lazy_static::lazy_static;
+use spin::Mutex;
+
+#[derive(Debug, Clone)]
+pub struct Context {
+    pub rbp: u64,
+    pub rax: u64,
+    pub rbx: u64,
+    pub rcx: u64,
+    pub rdx: u64,
+    pub rsi: u64,
+    pub rdi: u64,
+    pub r8: u64,
+    pub r9: u64,
+    pub r10: u64,
+    pub r11: u64,
+    pub r12: u64,
+    pub r13: u64,
+    pub r14: u64,
+    pub r15: u64,
+    pub rip: u64,
+    pub cs: u64,
+    pub rflags: u64,
+    pub rsp: u64,
+    pub ss: u64,
+}
+
+#[inline(always)]
+pub unsafe fn get_context() -> *const Context {
+    let ctx: *const Context;
+    asm!("push r15; push r14; push r13; push r12; push r11; push r10; push r9;\
+    push r8; push rdi; push rsi; push rdx; push rcx; push rbx; push rax; push rbp;\
+    mov {}, rsp; sub rsp, 0x400;",
+    out(reg) ctx);
+    ctx
+}
+
+#[inline(always)]
+pub unsafe fn restore_context(ctx: *const Context) {
+    asm!("mov rsp, {};\
+    pop rbp; pop rax; pop rbx; pop rcx; pop rdx; pop rsi; pop rdi; pop r8; pop r9;\
+    pop r10; pop r11; pop r12; pop r13; pop r14; pop r15; iretq;",
+    in(reg) ctx);
+}
+
+#[inline(never)]
+pub unsafe fn switch_to_usermode(code: VirtAddr, stack_end: VirtAddr) {
+    let (cs_idx, ds_idx) = gdt::set_usermode_segments();
+    x86_64::instructions::tlb::flush_all();
+    asm!("\
+    push rax   // stack segment
+    push rsi   // rsp
+    push 0x200 // rflags (only interrupt bit set)
+    push rdx   // code segment
+    push rdi   // ret to virtual addr
+    iretq",
+    in("rdi") code.as_u64(), in("rsi") stack_end.as_u64(), in("dx") cs_idx, in("ax") ds_idx);
+}
+
+#[derive(Clone, Debug)]
+enum TaskState {
+    SavedContext(Context),
+    StartingInfo(VirtAddr, VirtAddr),
+}
+
+struct Task {
+    state: TaskState,
+    fn_page_table: Box<PageTable>,
+    fn_stack_vec: Vec<u8>,
+}
+
+impl Task {
+    pub fn new(
+        exec_base: VirtAddr,
+        stack_end: VirtAddr,
+        fn_page_table: Box<PageTable>,
+        fn_stack_vec: Vec<u8>,
+    ) -> Task {
+        Task {
+            state: TaskState::StartingInfo(exec_base, stack_end),
+            fn_page_table,
+            fn_stack_vec,
+        }
+    }
+
+    pub fn enable_page_table(&self) {
+        let phys_addr = &self.fn_page_table;
+    }
+}
+
+pub struct Scheduler {
+    tasks: Mutex<Vec<Task>>,
+    current_task: Mutex<Option<usize>>,
+}
+
+use x86_64::structures::paging::mapper::Translate;
+use x86_64::{
+    structures::paging::{FrameAllocator, Mapper, Page, PageTable, PhysFrame, Size4KiB},
+    PhysAddr, VirtAddr,
+};
+
+impl Scheduler {
+    pub fn new() -> Scheduler {
+        Scheduler {
+            tasks: Mutex::new(Vec::new()),
+            current_task: Mutex::new(None),
+        }
+    }
+
+    pub unsafe fn schedule(
+        &self,
+        mapper: &mut (impl Mapper<Size4KiB> + Translate),
+        fn_addr: VirtAddr,
+        frame_allocator: &mut impl FrameAllocator<Size4KiB>,
+    ) {
+        use x86_64::structures::paging::PageTableFlags as Flags;
+
+        let userspace_fn_phys = Translate::translate_addr(mapper, fn_addr).unwrap(); // virtual address to physical
+        let page_phys_start = (userspace_fn_phys.as_u64() >> 12); // zero out page offset to get which page we should map
+        let fn_page_offset = userspace_fn_phys.as_u64() - page_phys_start; // offset of function from page start
+        let userspace_fn_virt_base = 0x400000; // target virtual address of page
+        let userspace_fn_virt = userspace_fn_virt_base + fn_page_offset; // target virtual address of function
+        let fn_page_table = Box::new(PageTable::new());
+        mapper
+            .map_to(
+                Page::from_start_address(VirtAddr::new(userspace_fn_virt_base)).unwrap(),
+                PhysFrame::containing_address(PhysAddr::new(page_phys_start)),
+                Flags::PRESENT | Flags::USER_ACCESSIBLE,
+                frame_allocator,
+            )
+            .unwrap()
+            .flush(); // map the program's code
+        mapper
+            .map_to(
+                Page::containing_address(VirtAddr::new(userspace_fn_virt_base + 0x1000)),
+                PhysFrame::containing_address(PhysAddr::new(page_phys_start + 0x1000)),
+                Flags::PRESENT | Flags::USER_ACCESSIBLE,
+                frame_allocator,
+            )
+            .unwrap()
+            .flush(); // also map another page to be sure we got the entire function in
+        let mut fn_stack_vec: Vec<u8> = Vec::with_capacity(0x1000); // allocate some memory to use for the stack
+        let fn_stack_virt = VirtAddr::new(fn_stack_vec.as_mut_ptr() as *const u8 as u64);
+        let fn_stack_phys = Translate::translate_addr(mapper, fn_stack_virt).unwrap(); // take physical address of stack
+        mapper
+            .map_to(
+                Page::from_start_address(VirtAddr::new(0x800000)).unwrap(),
+                frame_allocator.allocate_frame().unwrap(),
+                Flags::PRESENT | Flags::WRITABLE | Flags::USER_ACCESSIBLE,
+                frame_allocator,
+            )
+            .unwrap()
+            .flush(); // map the stack memory to 0x800000
+        let task = Task::new(
+            VirtAddr::new(userspace_fn_virt),
+            VirtAddr::new(0x801000),
+            fn_page_table,
+            fn_stack_vec,
+        ); // create task struct
+        self.tasks.lock().push(task); // push task struct to list of tasks
+    }
+
+    pub unsafe fn save_current_context(&self, ctxp: *const Context) {
+        self.current_task.lock().map(|cur_task_idx| {
+            let ctx = (*ctxp).clone();
+            self.tasks.lock()[cur_task_idx].state = TaskState::SavedContext(ctx);
+        });
+    }
+
+    pub unsafe fn run_next(&self) {
+        let tasks_len = self.tasks.lock().len();
+        if tasks_len > 0 {
+            let task_state = {
+                let mut cur_task_opt = self.current_task.lock();
+                let cur_task = cur_task_opt.get_or_insert(0);
+                let next_task = (*cur_task + 1) % tasks_len;
+                *cur_task = next_task;
+                let task = &self.tasks.lock()[next_task];
+                // task.enable_page_table();
+                task.state.clone()
+            };
+            match task_state {
+                TaskState::SavedContext(ctx) => restore_context(&ctx),
+                TaskState::StartingInfo(exec_base, stack_end) => {
+                    switch_to_usermode(exec_base, stack_end)
+                }
+            }
+        }
+    }
+}
+
+lazy_static! {
+    pub static ref SCHEDULER: Scheduler = { Scheduler::new() };
+}
diff --git a/kernel/src/scheduler/userspace.rs b/kernel/src/scheduler/userspace.rs
new file mode 100644
index 0000000..6a40da5
--- /dev/null
+++ b/kernel/src/scheduler/userspace.rs
@@ -0,0 +1,69 @@
+#[naked]
+pub async unsafe fn userspace_prog_1() {
+    asm!(
+        "\
+        mov rbx, 0xf0000000
+        prog1start:
+        push 0x595ca11a // keep the syscall number in the stack
+        mov rbp, 0x0 // distinct values for each register
+        mov rax, 0x1
+        mov rcx, 0x3
+        mov rdx, 0x4
+        mov rdi, 0x6
+        mov r8, 0x7
+        mov r9, 0x8
+        mov r10, 0x9
+        mov r11, 0x10
+        mov r12, 0x11
+        mov r13, 0x12
+        mov r14, 0x13
+        mov r15, 0x14
+        xor rax, rax
+        prog1loop:
+        inc rax
+        cmp rax, 0x4000000
+        jnz prog1loop // loop for some milliseconds
+        pop rax // pop syscall number from the stack
+        inc rbx // increase loop counter
+        mov rdi, rsp // first syscall arg is rsp
+        mov rsi, rbx // second syscall arg is the loop counter
+        syscall // perform the syscall!
+        jmp prog1start // do it all over
+    "
+    );
+}
+
+#[naked]
+pub unsafe fn userspace_prog_2() {
+    asm!(
+        "\
+        mov rbx, 0
+        prog2start:
+        push 0x595ca11b // keep the syscall number in the stack
+        mov rbp, 0x100 // distinct values for each register
+        mov rax, 0x101
+        mov rcx, 0x103
+        mov rdx, 0x104
+        mov rdi, 0x106
+        mov r8, 0x107
+        mov r9, 0x108
+        mov r10, 0x109
+        mov r11, 0x110
+        mov r12, 0x111
+        mov r13, 0x112
+        mov r14, 0x113
+        mov r15, 0x114
+        xor rax, rax
+        prog2loop:
+        inc rax
+        cmp rax, 0x4000000
+        jnz prog2loop // loop for some milliseconds
+        pop rax // pop syscall number from the stack
+        inc rbx // increase loop counter
+        mov rdi, rsp // first syscall arg is rsp
+        mov rsi, rbx // second syscall arg is the loop counter
+        syscall // perform the syscall!
+        jmp prog2start // do it all over
+    "
+    );
+}