#12 WIP, mainly working, but it doesn't like numpad keys, needs a look