First Working. Added template view