Merge pull request #1 from kylesh/master

Updated to a functional state.
Save fixed
1 and 2 are essentially the same thing.