Continuing edits to methods.

We should really kill fly wheels and water storage. Not only do we not
have the time, but they don't even fit because of their massive scale
compared to all these other energy sources.