Initial work on master template