Start of implementation of new user story