Whipping this gem into shape... some more...