commit: refactored to options not be a pointer.