Finished token specs and added validatons to the model