refactored to account for times when Options are

not injected through the constructor.