Template overhaul

preparing for move