Can you add a TODO note to add unit tests for this? I'll get those in sometime next week.