Fixed my laptop! Hurray!
Not only does it now have a fancy new keyboard that actually works, but I got me a brand, shiny new battery too! So now it's actually a laptop again, instead of some kind of strange, miniature desktop with built in screen!
So yeah, hurray! Love it!