references #27 created new modules, templates and renamed old template in preparation for this issue.