Please do separate it out into a different PR - same goes for line 165, too. Add a few tests with it, too.