made payments work + changed template name structure
merging