updated to use the new shell-casing class