Linus's rewrite

I've been busy!