This should be static
Add command parser for messages, needs testing