user story 12 not completely working yet, but basis there