user story 32 + 33 of sprint 07 finished