Completed cli fencing.  There may be same code changes required for some...

... functions in future though