Trying to pare this down some