Added rspec, fixed up key mapper (more testing to do)