Patched some things up! Test it out!