Refactor.  Add server component.