start moving util to project util. remember to move tests