Another EE2 rewrite with some of my own cool ideas...