User Story12300 Task 12311 amd 12312 

https://freedomvoice.tpondemand.com/entity/12311
https://freedomvoice.tpondemand.com/entity/12312