Work on message input and add more support for different commands