Last push for this version. Rewriting plugin, this ones too hard to
maintain since its all messy.