User stories no #118 and #119 done