done almost
need coments