New commandments from @pinboard, and a refactor

and a spec

and delete some skipped specs the framework gave me