Added basic saving class