Big update to add battery level stuff