Finish typing in the restart

Think I covered everything, minor todos left
Make "Main" "Old" and "New" "Main"