Continuing to scriptify and simplify commands