Time series

Merging to try and merge all changes with github default branch. Stupid github