Getting save/reuse working! Everything is there, need to debug