File refactoring, added basic 'stashing'.