Continuing the refactor of goodnessitude