finished userstory2 and 3
fixed build