its not getting the right template structure for some reason... merging to master