More initial commit and refactor.
Merge branch 'master' of github.com:killrweather/killrweather