WIP - Updating grammar to be more compliant
Fixed grammar to avoid recursion
Improved command line