Updated user stories - not complete yet