Added some TOKENs, and started to adhere to the BNF