Make saving work completely

TODO: recalculate times efficiently
Make grid recalculate