Merge pull request #60 from nolanfilter/Geo

cold blocks and cold controller
no message
Merge pull request #61 from nolanfilter/JimmyJam

no message