Added weather function
Added wireless function
Fixed a small merge conflict
Merge conflict with myself FTW
Aweful useless merge because I forgot to pull