Refactor to pass options ready for other use - hint file save