Refactor auth code for new interface
Update batteries