Completed adapting new code.

Next to build the grammar and handling the commands