- Save using input filename
- Better splitting of functionality