moving them into plugin, makes more sense
Workign still on the plugin