(one commit, the api endpoints were broken after user was combined and the api endpoints needed to be rewritten anyways, so no point in fixing stuff that is going to be deleted)