Work on macro binding generation, some cleanup needed, rename runner to plugin