Also, I need to update the unit tests. I didn't expect you to review this so quickly!