Certainly this is a point for a later pull request, but if you're enthusiastic enough to think on it the brain cycles would be much appreciated :)