Added new Energy Code using CoFH. Some minor Code Tweaking.