Issue #18.  refactor, adding just and nothing functions