Remove CommandHandler for now.
Add basic prefix and suffix functionality.