More cleanup and refactoring, Time system mostly done, Weather started