Refactor Message to check args when parsing
Temporary commit