finished userstory 6 and 7