Fix for possible recursion, addition of MeCommand, addition of ViewCommand