Pull request.  Hopefully this is helpful.

This will help the Spoon-Knife a lot!!

-[ ] finished