Newframework

Merge new template with master