Complete Application

Adding grammars, and update code