partially implemented new user story

Going to lecture and later finish it off