Templates are finished. Preparing to code review