A couple new icons for the article.
Fixing code-smell (simplifying functions) and fixing a couple unit test problems.  Also WIP on the article.