Overhaul - basic plugin working