- Better tests and use mock data
- Switch to Handlebars instead of raw Mustache