Refactored, added Open File, started save