- Reorganised request template handling and error handling - Added Content-Type response - Implemented templating data - Break out router