Ticket #1405: Beginning to retheme story and updates.