-Replacing replace-with calls with $replace calls
-Fixed bug to do with deck storage in local session