-Removed some redundant code
-First pass at file save