Renamed variables, and started reworking auth