adding the templating stuff
Updated the presnettion a bit more