commiting changes to merge master, saving auth to DB to do