Turned into a plugin!