new dummy template - need cleanup
conflicts resolved