Total command rewrite!