Adding Energy to Rover
Merge
Revert "Merge"

This reverts commit 6b4d00287186fdaaaa8b24d78c9e2df3983ae3ca.
Revert "Adding Energy to Rover"

This reverts commit d5d15f3980833fb73e13673c90325e8e21080e8c.