compiles and runs but without tests
tests compile and pass
added Template generation