Added untested template initilazation
Actually adding templates to map