Updated with the extra comands.

Note, this is still untested.