Fairly large refactoring :)
Revert "Fairly large refactoring :)"

This reverts commit f03ac235ea680e7d967f8800e0693a53c181bd3b.
Revert "Revert "Fairly large refactoring :)""

This reverts commit f614280d0e1f9732c1a43ae53d27791c4b79deba.
Minor drop tank tweaks
Added bonus range to solar collector [ORSE]
Merge pull request #1 from BobPalmer/DEV

RI 0.1.0