Common save call funcationality de-duplicated - code works still

Closes #63