Work was continued to cleanup, refactor, and repackage the scalars.