Started to implement new template