Add template
Initial touch-ups