Clean up
Use tasty
Add tests and fix bugs
Fix generation