Made template work (no MAKE yet)