More required user stories implemented