added templates, first draft of commandButton 'resolve'