Started adding authentication parts