Starting work, 9/29/2014
Added several options to wave.energy