Add separate enrgy tracking, and play around with things