dunno if i committed everything