Revert 1bd1fa1..8014abb

This rolls back to commit 1bd1fa1353ad09867e0d71b9aba761ad242154dc.
Added support to save locally