Some work on the grammar
A few working rules