Trying to whip this into shape