user story 32+33 finished