Energy 2.1 and 2.2

Summative review of energy content