Need to fix auth system