WIP - Plugin finished