Update timings
Update todos
Restructure config, update to 1.3
1.3 restructure update!