Command Functionality - in progress...
beta changes