Task #46 completed on Userstory3-View-list branch