Much nice code. Plus, it actually works now.