Line up requires
Add comments to objects
Add token success/failed reply templates