Restarting Correctly
Added pickle creation
Merge origin/master