Make dongle a command
Don't require spaces after command prefix
New rewrite