Battery drain issue

I've been gone. Looks like you made progress!