BOS1303566 - work in progress in module, templates completed