[MOD] Keyboard interupt and todos

Added some things that I want to work no
when I get the time to.