Major refactor to prep for adding battery poller