More gratuitous renames
Now have some more coherent weather example stuff
Massive overhall of how all the stuff with matching and should-have works. yes i know, large checkin but also large amount of redundant code