- adding ability to override the template easily
- removing what is unrequired
- fixing up the tests to reflect the changes