Add Wunderground model
Code cleanup
Remove TODOs