Add restart
Improve restart
Added bunch of stuff