Updated to a functional state.
Merge pull request #1 from kylesh/master

Updated to a functional state.
Save fixed - merged with rebel's repo