Adding a tiny little bit of handling. I really should add more.