More updates to the grammar to make it more flexible
Added TODO