Refactor.  No longer crashes.