add user tracking properly YAY :D, still stuff todo