In Progress

Fast Swish template modification