Typed some more
Added some restoration stuff