Whipping this gem into shape...