As far as moving to a plugin, are we doing this with all the style checks? My only concern is that we are as consistent as possible.