Refactoring. Prepping to add new/open/save file