Re-worked plugin logic, and added TODOS to README