First commit on energy panel