Added templating capability
Updated to write the Makefile