routing and some validation completed
regenerated everything