Keys & Stuff

#39

And some other stuff.