Updates and ongoing changes

Implemented storage queue catch in temp storage
Implemented temp storage recovery