user story 32+33 nearly finished